diff --git a/scm-webapp/src/main/resources/templates/error.mustache b/scm-webapp/src/main/resources/templates/error.mustache
new file mode 100644
index 0000000000..ade00d002b
--- /dev/null
+++ b/scm-webapp/src/main/resources/templates/error.mustache
@@ -0,0 +1,14 @@
+{{< layout}}
+
+  {{$title}}SCM-Manager Error{{/title}}
+
+  {{$content}}
+    <h2>There is an error occurred during SCM-Manager startup.</h2>
+
+    <div class="notification is-danger">
+      <pre>
+        {{ error }}
+      </pre>
+    </div>
+  {{/content}}
+{{/ layout}}
diff --git a/scm-webapp/src/main/resources/templates/repository-root.mustache b/scm-webapp/src/main/resources/templates/repository-root.mustache
deleted file mode 100644
index 7e5cd5951e..0000000000
--- a/scm-webapp/src/main/resources/templates/repository-root.mustache
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
-
-    Copyright (c) 2010, Sebastian Sdorra
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-    3. Neither the name of SCM-Manager; nor the names of its
-       contributors may be used to endorse or promote products derived from this
-       software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    http://bitbucket.org/sdorra/scm-manager
-
-
--->
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>SCM-Manager support information</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <style type="text/css">
-      body {
-        background-color: #ffffff;
-        margin: 10px;
-        color: #202020;
-        font-family: Verdana,Helvetica,Arial,sans-serif;
-        font-size: 75%;
-      }
-      h1, h2, h3, h4, h5 {
-        font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
-        font-weight: bold;
-        margin: 0px;
-        padding: 0px;
-        color: #D20005;
-      }
-      h1 {
-        font-size: 18px;
-        border-bottom: 1px solid #AFAFAF;
-      }
-      h2 {
-        font-size:  14px;
-        border-bottom: 1px solid #AFAFAF;
-      }
-      a:link, a:visited {
-        color: #045491;
-        font-weight: bold;
-        text-decoration: none;
-      }      
-      a:link:hover, a:visited:hover  {
-        color: #045491;
-        font-weight: bold;
-        text-decoration: underline;
-      }
-      table {
-        border: 0 none;
-        border-collapse: collapse;
-        font-size: 100%;
-        margin: 20px 0;
-        padding: 20px;
-        width: 100%;
-      }
-      td, th {
-        padding: 3px;
-        vertical-align: top;
-        border: 1px solid #CCCCCC;
-        text-align: left;
-      }
-      .small {
-        width: 20%;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>SCM-Manager Repositories</h1>
-    
-    <ul>
-    {{#repositories}}
-      <li>
-        <a href="{{url}}">{{name}}</a>
-      </li>
-    {{/repositories}}
-    </ul>
-    
-  </body>
-</html>
diff --git a/scm-webapp/src/main/resources/templates/support.mustache b/scm-webapp/src/main/resources/templates/support.mustache
deleted file mode 100644
index 822ac5e9d5..0000000000
--- a/scm-webapp/src/main/resources/templates/support.mustache
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--
-
-    Copyright (c) 2010, Sebastian Sdorra
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-    3. Neither the name of SCM-Manager; nor the names of its
-       contributors may be used to endorse or promote products derived from this
-       software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    http://bitbucket.org/sdorra/scm-manager
-
-
--->
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>SCM-Manager support information</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <style type="text/css">
-      body {
-        background-color: #ffffff;
-        margin: 10px;
-        color: #202020;
-        font-family: Verdana,Helvetica,Arial,sans-serif;
-        font-size: 75%;
-      }
-      h1, h2, h3, h4, h5 {
-        font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
-        font-weight: bold;
-        margin: 0px;
-        padding: 0px;
-        color: #D20005;
-      }
-      h1 {
-        font-size: 18px;
-        border-bottom: 1px solid #AFAFAF;
-      }
-      h2 {
-        font-size:  14px;
-        border-bottom: 1px solid #AFAFAF;
-      }
-      a:link, a:visited {
-        color: #045491;
-        font-weight: bold;
-        text-decoration: none;
-      }      
-      a:link:hover, a:visited:hover  {
-        color: #045491;
-        font-weight: bold;
-        text-decoration: underline;
-      }
-      table {
-        border: 0 none;
-        border-collapse: collapse;
-        font-size: 100%;
-        margin: 20px 0;
-        padding: 20px;
-        width: 100%;
-      }
-      td, th {
-        padding: 3px;
-        vertical-align: top;
-        border: 1px solid #CCCCCC;
-        text-align: left;
-      }
-      .small {
-        width: 20%;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>SCM-Manager support information</h1>
-    
-    <p>Information for SCM-Manager support.</p>
-    
-    <h2>Version</h2>
-    
-    <ul>
-      <li>Version: {{version.version}}</li>
-      <li>Stage: {{version.stage}}</li>
-      <li>StoreFactory: {{version.storeFactory}}</li>
-    </ul>
-    
-    <h2>Configuration</h2>
-    
-    <ul>
-      <li>Anonymous Access Enabled: {{configuration.anonymousAccessEnabled}}</li>
-      <li>Enable Proxy: {{configuration.enableProxy}}</li>
-      <li>Force Base Url: {{configuration.forceBaseUrl}}</li>
-      <li>Disable Grouping Grid: {{configuration.disableGroupingGrid}}</li>
-      <li>Enable Repository Archive: {{configuration.enableRepositoryArchive}}</li>
-    </ul>
-    
-    <h2>Installed Plugins</h2>
-    
-    <ul>
-      {{#pluginManager.installed}}
-      <li>{{id}}</li>
-      {{/pluginManager.installed}}
-    </ul>
-    
-    <h2>Runtime</h2>
-    
-    <ul>
-      <li>Free Memory: {{runtime.freeMemory}}</li>
-      <li>Total Memory: {{runtime.totalMemory}}</li>
-      <li>Max Memory: {{runtime.maxMemory}}</li>
-      <li>Available Processors: {{runtime.availableProcessors}}</li>
-    </ul>
-    
-    <h2>System</h2>
-    
-    <ul>
-      <li>OS: {{system.os}}</li>
-      <li>Architecture: {{system.arch}}</li>
-      <li>ServletContainer: {{system.container}}</li>
-      <li>Java: {{system.java}}</li>
-      <li>Local: {{system.locale}}</li>
-      <li>TimeZone: {{system.timeZone}}</li>
-    </ul>
-    
-    <h2>Repository Handlers</h2>
-    
-    <ul>
-    {{#repositoryHandlers}}
-      <li>{{type.displayName}}/{{type.name}} ({{versionInformation}})</li>
-    {{/repositoryHandlers}}
-    </ul>
-    
-  </body>
-</html>
