diff --git a/src/main/resources/static/js/index.html b/src/main/resources/static/js/index.html
deleted file mode 100644
index b644e37..0000000
--- a/src/main/resources/static/js/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>Webpack App</title>
-  </head>
-  <body>
-  <script type="text/javascript" src="/bundle.js"></script></body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/home_old.html b/src/main/resources/templates/admin/home_old.html
deleted file mode 100644
index 57387cb..0000000
--- a/src/main/resources/templates/admin/home_old.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <div th:replace="fragments/head :: headFragment">
-        <title id="pageTitle">Admin Home</title>
-    </div>
-    <script src="https://code.jquery.com/jquery-2.1.4.min.js" th:if="false"></script>
-    <script src="http://blackpeppersoftware.github.io/thymeleaf-fragment.js/thymeleaf-fragment.js" data-template-prefix="../" defer="defer" th:if="false"></script>
-    <script th:src="@{js/admin.js}" src="../../static/js/admin.js" defer="defer"></script>
-    <link th:href="@{/css/master.css}" href="../../static/css/master.css" rel="stylesheet" th:if="false">
-    <link th:href="@{/css/colors.css}" href="../../static/css/colors.css" rel="stylesheet" th:if="false">
-</head>
-<!-- TODO
-	Make user admin / remove user from admin
-	Change E2E passphrase
-	Delete Messages
--->
-
-<body>
-    <div th:include="fragments/navbar :: navbarFragment"></div>
-
-    <header>
-        <div class="container bg-primary">
-            <div class="row">
-                <div class="col-sm py-5">
-                    <h1 class="display-4 text-center">Admin Page</h1>
-                    <p class="alert-danger px-2">Warning: these settings can be dangerous..</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm col-md-4">
-                    <h4>Make User an Admin</h4>
-                    <form id="addUserToAdminForm">
-                        <div class="form-group">
-                            <label for="addUserToDropDown">Select User:</label>
-                            <select class="form-control custom-select" size="4" id="addUserToAdminDropDown">
-						
-								<option  th:each="userName : ${userNames}" 
-										th:value="${userName}" 
-										th:text="#{${userName}}">
-									Wireframe
-								</option>
-					
-							</select>
-
-
-                        </div>
-                        <div class="form-group">
-                            <button class="btn btn-danger form-control">Make admin</button>
-                        </div>
-                    </form>
-                </div>
-                <div class="col-sm col-md-4">
-                    <h4>Change passphrases</h4>
-                    <form id="changePassphraseForm">
-                        <div class="form-group">
-                            <label for="changePassphraseDropDown">Select User:</label>
-                            <select class="form-control" id="changePassphraseDropDown">
-							
-									<option  th:each="userName : ${userNames}" 
-											th:value="${userName}" 
-											th:text="#{${userName}}">
-										Wireframe
-									</option>
-						
-							</select>
-
-                        </div>
-                        <div class="form-group">
-                            <label for="passphraseOld">Passphrase Old</label>
-                            <input type="password" id="passphraseOld" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <label for="passphraseNew">Passphrase New</label>
-                            <input type="password" id="passphraseNew" class="form-control">
-                        </div>
-                        <div class="form-group">
-                            <button class="btn btn-danger form-control">Change Passphrase</button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-            <div class="row">
-                <!-- <div class="col-sm"></div> -->
-
-                <div class="col-sm d-lg-block">
-                    <div class="d-flex justify-content-center">
-                        <div class="py-5">
-                            <h4 class="p-2 text-center">Logout</h4>
-                            <form action="#" th:action="@{/logout}" method="POST">
-                                <!-- <input type="submit" value="logout"> -->
-                                <!-- <input type="hidden" th:name="${_csrf.parameterName}"
-												th:value="${_csrf.token}" /> -->
-                                <div class="form-group">
-                                    <button class="btn btn-secondary form-control">Logout</button>
-                                </div>
-                            </form>
-
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </header>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/crypto.html b/src/main/resources/templates/crypto.html
deleted file mode 100644
index 026bc1b..0000000
--- a/src/main/resources/templates/crypto.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<head xmlns:th="http://www.thymeleaf.org">
-    <title></title>
-	<!-- 	
-    <link th:href="@{/css/things.css}" rel="stylesheet"></link>
-    JS    
-    <script th:src="@{/js/things.js}" type="text/javascript"></script> -->
-    <script th:src="@{js/scljs.js}" type="text/javascript"></script>
-    <script th:src="@{js/my_Crypto.js}" type="text/javascript"></script>
-	
-</head>
-
-<body>
-<div id="crypt"></div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index bbbf913..23e6de4 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -6,10 +6,13 @@
         <meta charset="UTF-8">
         <title id="pageTitle">Navbar Fragment</title>
     </div>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/esm/popper.js" type="module" th:if="false"></script>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.css" th:if="false" rel="stylesheet" type="text/css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/esm/popper.js" type="module"
+        th:if="false"></script>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.css" th:if="false"
+        rel="stylesheet" type="text/css">
     <script src="https://code.jquery.com/jquery-2.1.4.min.js" th:if="false"></script>
-    <script src="http://blackpeppersoftware.github.io/thymeleaf-fragment.js/thymeleaf-fragment.js" defer="defer" th:if="false"></script>
+    <script src="http://blackpeppersoftware.github.io/thymeleaf-fragment.js/thymeleaf-fragment.js" defer="defer"
+        th:if="false"></script>
 </head>
 
 <body>
@@ -18,47 +21,6 @@
         <nav class="navbar navbar-expand-sm bg-dark navbar-dark fixed-top">
             <div class="container">
                 <a href="home.html" th:href="@{/}" class="navbar-brand">Chatto</a>
-                <!-- <div class="navbar-header">
-                    <button class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
-                    <i class="fas fa-chevron-down"></i>
-     
-                    </button>
-                </div>
-                <div class="collapse navbar-collapse" id="navbarCollapse">
-                    <ul class="navbar-nav ml-auto">
-                        <li class="nav-item">
-                            <a href="home.html" th:href="@{/}" class="nav-link">Home</a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="user/home.html" sec:authorize="isFullyAuthenticated()" th:href="@{/user}" class="nav-link">User Area</a>
-                        </li>
-                        <li class="nav-item">
-                            <a th:href="chat" href="chat.html" class="nav-link">Chat</a>
-                        </li>
-                        <li class="nav-item">
-                            <a th:href="login" sec:authorize="!isFullyAuthenticated()" href="login.html" class="nav-link">Login</a>
-                        </li>
-                        <li class="nav-item">
-                            <a th:href="registration" sec:authorize="!isFullyAuthenticated()" href="registration.html" class="nav-link">Register</a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="#" class="nav-link">About</a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="#" class="nav-link">Contact</a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="#" sec:authorize="isFullyAuthenticated()" th:href="@{/admin}" class="nav-link">
-                                Admin Area
-                            </a>
-                        </li>
-                        <li class="nav-item">
-                            <a href="#" sec:authorize="isFullyAuthenticated()" th:text="${#authentication.name}" class="nav-link text-white font-weight-bold">
-                                nova
-                            </a>
-                        </li>
-                    </ul>
-                </div> -->
                 <th:block th:include="fragments/navbar :: navbarContent"></th:block>
             </div>
         </nav>
@@ -66,42 +28,46 @@
     </th:block>
 
     <th:block th:fragment="navbarContent">
-            <div class="navbar-header">
-                    <button class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
-                    <i class="fas fa-chevron-down"></i>
-     
-                    </button>
-            </div>
-            <div class="collapse navbar-collapse" id="navbarCollapse">
-                <ul class="navbar-nav ml-auto">
-                    <li class="nav-item">
-                        <a href="home.html" th:href="@{/}" class="nav-link">Home</a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="user/home.html" sec:authorize="isFullyAuthenticated()" th:href="@{/user}" class="nav-link">User Area</a>
-                    </li>
-                    <li class="nav-item">
-                        <a th:href="@{/chat}" href="chat.html" class="nav-link">Chat</a>
-                    </li>
-                    <li class="nav-item">
-                        <a th:href="login" sec:authorize="!isFullyAuthenticated()" href="login.html" class="nav-link">Login</a>
-                    </li>
-                    <li class="nav-item">
-                        <a th:href="registration" sec:authorize="!isFullyAuthenticated()" href="registration.html" class="nav-link">Register</a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#" class="nav-link">About</a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#" class="nav-link">Contact</a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#" sec:authorize="hasRole('ROLE_ADMIN') || hasRole('ROLE_SUPER_USER')" th:href="@{/admin}" class="nav-link">
-                            Admin Area
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#" sec:authorize="isFullyAuthenticated()" th:text="${#authentication.name}" class="nav-link text-white font-weight-bold">
+        <div class="navbar-header">
+            <button class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
+                <i class="fas fa-chevron-down"></i>
+
+            </button>
+        </div>
+        <div class="collapse navbar-collapse" id="navbarCollapse">
+            <ul class="navbar-nav ml-auto">
+                <li class="nav-item">
+                    <a href="home.html" th:href="@{/}" class="nav-link">Home</a>
+                </li>
+                <li class="nav-item">
+                    <a href="user/home.html" sec:authorize="isFullyAuthenticated()" th:href="@{/user}"
+                        class="nav-link">User Area</a>
+                </li>
+                <li class="nav-item">
+                    <a th:href="@{/chat}" href="chat.html" class="nav-link">Chat</a>
+                </li>
+                <li class="nav-item">
+                    <a th:href="login" sec:authorize="!isFullyAuthenticated()" href="login.html"
+                        class="nav-link">Login</a>
+                </li>
+                <li class="nav-item">
+                    <a th:href="registration" sec:authorize="!isFullyAuthenticated()" href="registration.html"
+                        class="nav-link">Register</a>
+                </li>
+                <li class="nav-item">
+                    <a href="#" class="nav-link">About</a>
+                </li>
+                <li class="nav-item">
+                    <a href="#" class="nav-link">Contact</a>
+                </li>
+                <li class="nav-item">
+                    <a href="#" sec:authorize="hasRole('ROLE_ADMIN') || hasRole('ROLE_SUPER_USER')" th:href="@{/admin}"
+                        class="nav-link">
+                        Admin Area
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a href="#" sec:authorize="isFullyAuthenticated()" th:text="${#authentication.name}" class="nav-link text-white font-weight-bold">
                             nova
                         </a>
                     </li>
