diff --git a/custom/templates/base/footer_content.tmpl b/custom/templates/base/footer_content.tmpl
index ed66a7d..277b585 100644
--- a/custom/templates/base/footer_content.tmpl
+++ b/custom/templates/base/footer_content.tmpl
@@ -12,8 +12,7 @@
 			{{end}}
 			{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
 				{{.locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
-				{{.locale.Tr "template"}}
-				{{if .TemplateName}}{{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
+				{{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
 			{{end}}
 		</div>
 		<div class="ui right links">
diff --git a/custom/templates/base/head_navbar.tmpl b/custom/templates/base/head_navbar.tmpl
index 8ecbbe3..e8f2862 100644
--- a/custom/templates/base/head_navbar.tmpl
+++ b/custom/templates/base/head_navbar.tmpl
@@ -77,6 +77,7 @@
 		</div>
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
+			{{if EnableTimetracking}}
 			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
 				<span class="text">
 					<span class="fitted item">
@@ -113,6 +114,7 @@
 					</form>
 				</div>
 			</div>
+			{{end}}
 
 			<a href="/notifications" class="m-4 text black tooltip not-mobile" data-content='{{.locale.Tr "notifications"}}'>
 				<span class="text">
@@ -169,7 +171,7 @@
 							{{.locale.Tr "your_starred"}}
 						</a>
 					{{end}}
-					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="/user/settings">
+					<a class="{{if .PageIsUserSettings}}active {{end}}item" href="/user/settings">
 						{{svg "octicon-tools"}}
 						{{.locale.Tr "your_settings"}}<!-- Your settings -->
 					</a>
@@ -180,7 +182,7 @@
 					{{if .IsAdmin}}
 						<div class="divider"></div>
 
-						<a class="{{if .PageIsAdmin}}active{{end}} item" href="/admin">
+						<a class="{{if .PageIsAdmin}}active {{end}}item" href="/admin">
 							{{svg "octicon-server"}}
 							{{.locale.Tr "admin_panel"}}<!-- Admin Panel -->
 						</a>