diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index bf594bfc..e52f939e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,9 +16,9 @@ server.error.include-stacktrace=always
 server.error.include-exception=true
 server.error.include-message=always
 
-logging.level.org.springframework.web=DEBUG
-logging.level.org.springframework=DEBUG
-logging.level.org.springframework.security=DEBUG
+#logging.level.org.springframework.web=DEBUG
+#logging.level.org.springframework=DEBUG
+#logging.level.org.springframework.security=DEBUG
 
 login.enabled=true
 
diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties
index 5b211262..b560e8de 100644
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -31,7 +31,11 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-
+delete=Delete
+username=Username
+password=Password
+welcome=Welcome
+=Property
 
 #############
 #  NAVBAR   #
@@ -54,18 +58,41 @@ settings.downloadOption.1=Open in same window
 settings.downloadOption.2=Open in new window
 settings.downloadOption.3=Download file
 settings.zipThreshold=Zip files when the number of downloaded files exceeds
-
-settings.accountSettings=Account Settings
-settings.adminSettings=Admin Settings- View and Add Users
-settings.userControlSettings=User Control Settings
-settings.changeUsername=New Username
-settings.changeUsernameButton=Change Username
-settings.password=Confirmation Password
-settings.oldPassword=Old password
-settings.newPassword=New Password
-settings.changePasswordButton=Change Password
-settings.confirmNewPassword=Confirm New Password
 settings.signOut=Sign Out
+settings.accountSettings=Account Settings
+
+account.accountSettings=Account Settings
+account.adminSettings=Admin Settings - View and Add Users
+account.userControlSettings=User Control Settings
+account.changeUsername=New Username
+account.changeUsername=Change Username
+account.password=Confirmation Password
+account.oldPassword=Old password
+account.newPassword=New Password
+account.changePassword=Change Password
+account.confirmNewPassword=Confirm New Password
+account.signOut=Sign Out
+account.yourApiKey=Your API Key
+account.syncTitle=Sync browser settings with Account
+account.settingsCompare=Settings Comparison:
+account.property=Property
+account.webBrowserSettings=Web Browser Setting
+account.syncToBrowser=Sync Account -> Browser
+account.syncToAccount=Sync Account <- Browser
+
+
+adminUserSettings.title=User Control Settings
+adminUserSettings.header=Admin User Control Settings
+adminUserSettings.admin=Admin
+adminUserSettings.user=User
+Add New User
+Roles
+Role
+Actions
+adminUserSettings.apiUser=Limited API User
+adminUserSettings.webOnlyUser=Web Only User
+adminUserSettings.submit=Save User
+
 #############
 # HOME-PAGE #
 #############
diff --git a/src/main/resources/templates/account.html b/src/main/resources/templates/account.html
index 1b2bb894..714f8029 100644
--- a/src/main/resources/templates/account.html
+++ b/src/main/resources/templates/account.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title=#{settings.userSettings})}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{account.userSettings})}"></th:block>
 
 <body>
     <th:block th:insert="~{fragments/common :: game}"></th:block>
@@ -14,60 +14,60 @@
                     <div class="col-md-9">
 
                         <!-- User Settings Title -->
-                        <h2 class="text-center" th:text="#{settings.accountSettings}">User Settings</h2>
+                        <h2 class="text-center" th:text="#{account.accountSettings}">User Settings</h2>
                         <hr>
 
 						<!-- At the top of the user settings -->
-						<h3 class="text-center">Welcome <span th:text="${username}">User</span>!</h3>
+						<h3 class="text-center"><span th:text="#{welcome} + ' ' + ${username}">User</span>!</h3>
 
 						
                         <!-- Change Username Form -->
-                        <h4>Change username?</h4>
+                        <h4></h4>
                         <form action="/change-username" method="post">
                             <div class="form-group">
-                                <label for="newUsername" th:text="#{settings.changeUsername}">Change Username</label>
+                                <label for="newUsername" th:text="#{account.changeUsername}">Change Username</label>
                                 <input type="text" class="form-control" name="newUsername" id="newUsername" placeholder="New Username">
                             </div>
                             <div class="form-group">
-                                <label for="currentPassword" th:text="#{settings.password}">Password</label>
+                                <label for="currentPassword" th:text="#{password}">Password</label>
                                 <input type="password" class="form-control" name="currentPassword" id="currentPassword" placeholder="Password">
                             </div>
                             <div class="form-group">
-                                <button type="submit" class="btn btn-primary" th:text="#{settings.changeUsernameButton}">Change Username</button>
+                                <button type="submit" class="btn btn-primary" th:text="#{account.changeUsername}">Change Username</button>
                             </div>
                         </form>
                         
                         <hr> <!-- Separator Line -->
 
                         <!-- Change Password Form -->
-                        <h4>Change Password?</h4>
+                        <h4 th:text="#{account.changePassword}">Change Password?</h4>
                         <form action="/change-password" method="post">
                             <div class="form-group">
-                                <label for="currentPassword" th:text="#{settings.oldPassword}">Old Password</label>
-                                <input type="password" class="form-control" name="currentPassword" id="currentPassword" placeholder="Old Password">
+                                <label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
+                                <input type="password" class="form-control" name="currentPassword" id="currentPassword"  th:placeholder="#{account.oldPassword}">
                             </div>
                             <div class="form-group">
-                                <label for="newPassword" th:text="#{settings.newPassword}">New Password</label>
-                                <input type="password" class="form-control" name="newPassword" id="newPassword" placeholder="New Password">
+                                <label for="newPassword" th:text="#{account.newPassword}">New Password</label>
+                                <input type="password" class="form-control" name="newPassword" id="newPassword" th:placeholder="#{account.newPassword}">
                             </div>
                             <div class="form-group">
-                                <label for="confirmNewPassword" th:text="#{settings.confirmNewPassword}">Confirm New Password</label>
-                                <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" placeholder="Confirm New Password">
+                                <label for="confirmNewPassword" th:text="#{account.confirmNewPassword}">Confirm New Password</label>
+                                <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
                             </div>
                             <div class="form-group">
-                                <button type="submit" class="btn btn-primary" th:text="#{settings.changePasswordButton}">Change Password</button>
+                                <button type="submit" class="btn btn-primary" th:text="#{account.changePassword}">Change Password</button>
                             </div>
                         </form>
 
 						<hr>
 						
 						<div class="card">
-					        <div class="card-header">
-					            Your API Key
+					        <div class="card-header" th:text="#{account.yourApiKey}">
+					            
 					        </div>
 					        <div class="card-body">
 					            <div class="input-group mb-3">
-					                <input type="password" class="form-control" id="apiKey" placeholder="Your API Key" readonly>
+					                <input type="password" class="form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly>
 					                <div class="input-group-append">
 					                	<button class="btn btn-outline-secondary" id="copyBtn" type="button" onclick="copyToClipboard()"> 
 					                    	<img src="images/clipboard.svg" alt="Copy" style="height:20px;">
@@ -161,15 +161,15 @@
     
                         <hr> <!-- Separator Line -->
                         
-                        <h4>Sync browser settings with Account</h4>
+                        <h4 th:text="#{account.syncTitle}">Sync browser settings with Account</h4>
                         <div class="container mt-4">
-    <h3>Settings Comparison:</h3>
+    <h3 th:text="#{account.settingsCompare}">Settings Comparison:</h3>
     <table id="settingsTable" class="table table-bordered table-sm table-striped">
         <thead>
             <tr>
-                <th>Property</th>
-                <th>Account Setting</th>
-                <th>Web Browser Setting</th>
+                <th th:text="#{account.property}">Property</th>
+                <th  th:text="#{account.accountSettings}">Account Setting</th>
+                <th  th:text="#{account.webBrowserSettings}">Web Browser Setting</th>
             </tr>
         </thead>
         <tbody>
@@ -178,8 +178,8 @@
     </table>
 
     <div class="buttons-container mt-3 text-center">
-        <button id="syncToBrowser" class="btn btn-primary btn-sm">Sync Account -> Browser</button>
-        <button id="syncToAccount" class="btn btn-secondary btn-sm">Sync Account <- Browser</button>
+        <button id="syncToBrowser" class="btn btn-primary btn-sm" th:text="#{account.syncToBrowser}">Sync Account -> Browser</button>
+        <button id="syncToAccount" class="btn btn-secondary btn-sm" th:text="#{account.syncToAccount}">Sync Account <- Browser</button>
     </div>
 </div>
 
@@ -276,10 +276,10 @@
                         
                         <div class="form-group mt-4">
                             <a href="/logout">
-                                <button type="button" class="btn btn-danger" th:text="#{settings.signOut}">Sign Out</button>
+                                <button type="button" class="btn btn-danger" th:text="#{account.signOut}">Sign Out</button>
                             </a>
                             <a th:if="${role == 'ROLE_ADMIN'}" href="addUsers" target="_blank">
-						        <button type="button" class="btn btn-info"  th:text="#{settings.adminSettings}">Admin Settings</button>
+						        <button type="button" class="btn btn-info"  th:text="#{account.adminSettings}">Admin Settings</button>
 						    </a>
 
                         </div>
diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html
index fbff33e6..88b66112 100644
--- a/src/main/resources/templates/addUsers.html
+++ b/src/main/resources/templates/addUsers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title=#{settings.userSettings})}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{adminUserSettings.title})}"></th:block>
 
 <body>
     <th:block th:insert="~{fragments/common :: game}"></th:block>
@@ -14,7 +14,7 @@
                     <div class="col-md-8">
 
                         <!-- User Settings Title -->
-                        <h2 class="text-center" th:text="#{settings.userControlSettings}">User Control Settings</h2>
+                        <h2 class="text-center" th:text="#{adminUserSettings.header}">Admin User Control Settings</h2>
                       
 
 						
@@ -32,7 +32,7 @@
 						            <td th:text="${user.username}"></td>
 						            <td th:text="${user.getRolesAsString()}"></td>
 						            <td>
-						                <a th:href="@{'/admin/deleteUser/' + ${user.username}}">Delete</a>
+						                <a th:href="@{'/admin/deleteUser/' + ${user.username}}" th:text="#{delete}">Delete</a>
 						            </td>
 						        </tr>
 						    </tbody>
@@ -42,25 +42,25 @@
 						<h2>Add New User</h2>
 					    <form action="/admin/saveUser" method="post">
 					        <div class="form-group">
-					            <label for="username">Username</label>
+					            <label for="username" th:text="#{username}">Username</label>
 					            <input type="text" class="form-control" name="username" required>
 					        </div>
 					        <div class="form-group">
-					            <label for="password">Password</label>
+					            <label for="password" th:text="#{password}">Password</label>
 					            <input type="password" class="form-control" name="password" required>
 					        </div>
 					        <div class="form-group">
 						        <label for="role">Role</label>
 						        <select name="role" class="form-control" required>
-						            <option value="ROLE_ADMIN">Admin</option>
-						            <option value="ROLE_USER">User</option>
-						            <option value="ROLE_LIMITED_API_USER">Limited API User</option>
-						            <option value="ROLE_WEB_ONLY_USER">Web Only User</option>
+						            <option value="ROLE_ADMIN"  th:text="#{adminUserSettings.admin}">Admin</option>
+						            <option value="ROLE_USER" th:text="#{adminUserSettings.user}">User</option>
+						            <option value="ROLE_LIMITED_API_USER" th:text="#{adminUserSettings.apiUser}">Limited API User</option>
+						            <option value="ROLE_WEB_ONLY_USER" th:text="#{adminUserSettings.webOnlyUser}">Web Only User</option>
 						        </select>
 						    </div>
 					        
 					        <!-- Add other fields as required -->
-					        <button type="submit" class="btn btn-primary">Save User</button>
+					        <button type="submit" class="btn btn-primary"  th:text="#{adminUserSettings.submit}">Save User</button>
 					    </form>
                     </div>
                 </div>
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index 07ecd772..0f85f7c8 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -338,17 +338,18 @@
                     <label class="custom-control-label" for="boredWaiting" th:text="#{bored}"></label>
                   </div>
                 </div>
-                
-                <div th:if="${@loginEnabled}">
-	                <a href="account" target="_blank">
-	                    <button type="button" class="btn btn-sm btn-outline-primary" th:text="#{settings.accountSettings}">Account Settings</button>
-	                </a>
-	               <a href="/logout">
+                <a th:if="${@loginEnabled}" href="account" target="_blank">
+                    <button type="button" class="btn btn-sm btn-outline-primary" th:text="#{settings.accountSettings}">Account Settings</button>
+                </a>
+	              
+
+            </div>
+            
+             
+            <div class="modal-footer">
+            	<a th:if="${@loginEnabled}" href="/logout">
 	                  <button type="button" class="btn btn-danger" th:text="#{settings.signOut}">Sign Out</button>
 	              </a>
-               </div>
-            </div>
-            <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal" th:text="#{close}"></button>
             </div>
             
