diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 4b687dd..41f6519 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -2,15 +2,15 @@
 	<ul id="nav__top-level" ng-style="navStyle">
 		<li>
 			<a class="btn-overview"  ng-class="{opened: firstLevel == 'overview'}" href="#/overview/system" ng-click="change('overview')" tabindex="1">
-			<span class="">Server Overview</span></a>
+			<span class="">Server overview</span></a>
 		</li>
 		<li>
 			<button class="btn-health" ng-class="{opened: firstLevel == 'server-health'}" ng-click="change('server-health')" tabindex="9">
-			<span>Server Health</span></button>
+			<span>Server health</span></button>
 		</li>
 		<li>
 			<button class="btn-control" ng-class="{opened: firstLevel == 'server-control'}" ng-click="change('server-control')">
-			<span>Server Control</span></button>
+			<span>Server control</span></button>
 		</li>
 		<li>
 			<button class="btn-config" ng-class="{opened: firstLevel == 'configuration'}" ng-click="change('configuration')">
@@ -25,27 +25,34 @@
 			<span>Users</span></button>
 		</li>
 	</ul>
-	<ul class="nav__second-level btn-overview" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'overview')}">
-		<li ng-class="{'active': (path == '/overview' || path == '/overview/system')}" tabindex="2">
-			<a href="#/overview/system" ng-click="closeSubnav()">System overview</a></li>
-	</ul>
+	<!--<ul class="nav__second-level btn-overview" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'overview')}">-->
+	<!--<li ng-class="{'active': (path == '/overview' || path == '/overview/system')}" tabindex="2">-->
+	<!--<a href="#/overview/system" ng-click="closeSubnav()">System overview</a></li>-->
+	<!--</ul>-->
 	<ul class="nav__second-level btn-health" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'server-health')}">
-		<li ng-class="{'active': (path == '/server-health/event-log')}"><a href="#/server-health/event-log" tabindex="7" ng-click="closeSubnav()">Event log</a></li>
-		<li ng-class="{'active': (path == '/server-health/inventory-overview' || path == '/server-health/inventory')}" ng-click="closeSubnav()"><a href="#/server-health/inventory-overview">Hardware inventory</a></li>
-		<li ng-class="{'active': (path == '/server-health/sensors-overview' || path == '/server-health/sensors')}"><a href="#/server-health/sensors-overview" ng-click="closeSubnav()">Sensor data</a></li>
+		<li ng-class="{'active': (path == '/server-health/event-log')}">
+			<a href="#/server-health/event-log" tabindex="7" ng-click="closeSubnav()">Event log</a></li>
+		<li ng-class="{'active': (path == '/server-health/inventory-overview' || path == '/server-health/inventory')}" ng-click="closeSubnav()">
+			<a href="#/server-health/inventory-overview">Hardware inventory</a></li>
+		<li ng-class="{'active': (path == '/server-health/sensors-overview' || path == '/server-health/sensors')}">
+			<a href="#/server-health/sensors-overview" ng-click="closeSubnav()">Sensor data</a></li>
 		<!--<li ng-class="{'active': (path == '/server-health/power-consumption')}"><a href="#/server-health/power-consumption" tabindex="4" ng-click="closeSubnav()">Power consumption</a></li>-->
-		<li ng-class="{'active': (path == '/server-health/unit-id')}"><a href="#/server-health/unit-id" tabindex="6" ng-click="closeSubnav()">Unit ID</a></li>
+		<li ng-class="{'active': (path == '/server-health/unit-id')}">
+			<a href="#/server-health/unit-id" tabindex="6" ng-click="closeSubnav()">Server indicator</a></li>
 		<!--<li ng-class="{'active': (path == '/server-health/diagnostics')}"><a href="#/server-health/diagnostics" ng-click="closeSubnav()">Diagnostics</a></li>-->
 	</ul>
 	<ul class="nav__second-level btn-control" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'server-control')}">
-		<li ng-class="{'active': (path == '/server-control' || path == '/server-control/power-operations')}" tabindex="3"><a href="#/server-control/power-operations" ng-click="closeSubnav()">Server power operations</a></li>
-		<li ng-class="{'active': (path == '/server-control/bmc-reboot')}"><a href="#/server-control/bmc-reboot" tabindex="8" ng-click="closeSubnav()">Reboot BMC</a></li>
-		<li ng-class="{'active': (path == '/server-control/remote-console')}"><a href="#/server-control/remote-console" tabindex="5" ng-click="closeSubnav()">Remote console</a></li>
+		<li ng-class="{'active': (path == '/server-control' || path == '/server-control/power-operations')}" tabindex="3">
+			<a href="#/server-control/power-operations" ng-click="closeSubnav()">Server power operations</a></li>
+		<li ng-class="{'active': (path == '/server-control/bmc-reboot')}">
+			<a href="#/server-control/bmc-reboot" tabindex="8" ng-click="closeSubnav()">Reboot BMC</a></li>
+		<li ng-class="{'active': (path == '/server-control/remote-console')}">
+			<a href="#/server-control/remote-console" tabindex="5" ng-click="closeSubnav()">Serial over LAN</a></li>
 	</ul>
 	<ul class="nav__second-level btn-firmware" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'configuration')}">
 		<li ng-class="{'active': (path == '/configuration' || path == '/configuration/network')}"><a href="#/configuration/network" ng-click="closeSubnav()">Network settings</a></li>
 		<!--<li ng-class="{'active': (path == '/configuration/date-time')}"><a href="#/configuration/date-time" ng-click="closeSubnav()">Date & Time</a></li>-->
-		<li ng-class="{'active': (path == '/configuration/security')}"><a href="#/configuration/security" ng-click="closeSubnav()">Security</a></li>
+		<!--<li ng-class="{'active': (path == '/configuration/security')}"><a href="#/configuration/security" ng-click="closeSubnav()">Security</a></li>-->
 		<!--<li ng-class="{'active': (path == '/configuration/file')}"><a href="#/configuration/file" ng-click="closeSubnav()">Configuration File</a></li>-->
 	</ul>
 	<ul class="nav__second-level btn-firmware" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'firmware')}">
@@ -53,6 +60,7 @@
 		<li ng-class="{'active': (path == '/firmware/server')}"><a href="#/firmware/server" ng-click="closeSubnav()">Server firmware</a></li>
 	</ul>
 	<ul class="nav__second-level btn-users" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'users')}">
-		<li ng-class="{'active': (path == '/users' || path == '/users/manage-accounts')}"><a href="#/users/manage-accounts" ng-click="closeSubnav()">Manage user account</a></li>
+		<li ng-class="{'active': (path == '/users' || path == '/users/manage-accounts')}">
+			<a href="#/users/manage-accounts" ng-click="closeSubnav()">Manage user account</a></li>
 	</ul>
 </nav>
diff --git a/app/common/directives/log-search-control.html b/app/common/directives/log-search-control.html
index 03b699b..0c0c7de 100644
--- a/app/common/directives/log-search-control.html
+++ b/app/common/directives/log-search-control.html
@@ -1,5 +1,5 @@
 <div class="content__search">
     <label for="content__search-input">Event Log Search</label>
     <input id="content__search-input" type="text" placeholder="Filter issues" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
-    <input id="content__search-submit" type="submit" class="btn btn-secondary" value="Submit" ng-click="doSearchOnClick()"/>
+    <input id="content__search-submit" type="submit" class="btn btn-secondary" value="Filter" ng-click="doSearchOnClick()"/>
 </div>
\ No newline at end of file
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index 9f6a126..b555622 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -1,4 +1,4 @@
 <div class="row column">
-    <h1>System Overview</h1>
-    <p>System overview will be here.</p>
+    <h1>Server overview</h1>
+    <p>Server overview will be here.</p>
 </div>
\ No newline at end of file
diff --git a/app/server-control/controllers/bmc-reboot-controller.html b/app/server-control/controllers/bmc-reboot-controller.html
index 50fca7f..082e0d5 100644
--- a/app/server-control/controllers/bmc-reboot-controller.html
+++ b/app/server-control/controllers/bmc-reboot-controller.html
@@ -4,7 +4,7 @@
     </div>
 
     <div class="row column  btm-border-grey">
-        <span class="bmc-reboot__status-log inline">BMC last reboot at {{dataService.last_updated |date:'h:mm:ss on MM/dd/yyyy'}}</span>
+        <span class="bmc-reboot__status-log inline">BMC last reboot at {{dataService.last_updated |date:'h:mm:ss on MMM dd yyyy'}}</span>
     </div>
 
     <div class="row column btm-border-grey bmc-reboot-option"
@@ -13,7 +13,7 @@
             <li>Rebooting the BMC causes your browser to lose contact with the BMC for several minutes.</li>
             <li>When the BMC software has started, you can then log in again.</li>
             <li>If the Log In button is not enabled after several minutes, you may need to point your browser to the
-                BMC’s address and log in again.
+                BMC’s address to log in again.
             </li>
         </ul>
         <button id="bmc__reboot" class="btn-secondary" ng-click="rebootConfirm()" ng-disabled="dataService.server_unreachable"><i>&#x21BB</i> Reboot BMC
diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html
index 79aa861..54c31fc 100644
--- a/app/server-control/controllers/power-operations-controller.html
+++ b/app/server-control/controllers/power-operations-controller.html
@@ -1,14 +1,14 @@
 <div id="power-operations">
 
     <div class="row column">
-        <h1>Server power operation</h1>
+        <h1>Server power operations</h1>
     </div>
 
     <!-- Current status and bar display the state of the server. Class 'power__state-off' is applied to bar and 'power__state' text switches to say "off"-->
     <div class="row column">
         <div class="power__current-status ">
             <h2 class="inline h4">Current status</h2>
-            <span class="power__status-log inline float-right">Server last reset at {{dataService.last_updated |date:'h:mm:ss on MM/dd/yyyy'}}</span>
+            <span class="power__status-log inline float-right">Server last reboot at {{dataService.last_updated |date:'h:mm:ss on MMM dd yyyy'}}</span>
         </div>
     </div>
     <div class="row column">
@@ -24,7 +24,7 @@
 
         <!-- Power on displays only when server is shutdown -->
         <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Quiesced'" ng-class="{disabled: dataService.server_unreachable || (confirm && !power_confirm) || dataService.loading, transitionAll: confirm && power_confirm}">
-            <button id="power__power-on" class="btn-secondary" ng-click="togglePower()" role="button" ng-disabled="dataService.server_unreachable"><img src="assets/images/icon-power.svg">Power On</button>
+            <button id="power__power-on" class="btn-secondary" ng-click="togglePower()" role="button" ng-disabled="dataService.server_unreachable"><img src="assets/images/icon-power.svg">Power on</button>
             <p>Attempts to power on the server</p>
 
             <!---<confirm title="power off" message="Power off the server" confirm="power_confirm" ng-show="power_confirm" callback="togglePower"></confirm>-->
diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html
index 977be6b..aae71b4 100644
--- a/app/server-health/controllers/inventory-overview-controller.html
+++ b/app/server-health/controllers/inventory-overview-controller.html
@@ -1,6 +1,6 @@
 <div id="inventory-overview">
     <div class="row column">
-        <h1>Hardware Inventory</h1>
+        <h1>Hardware inventory</h1>
     </div>
     <section class="row column">
         <div class="page-header">
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index dfa73b4..6646845 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -1,6 +1,6 @@
 <div id="event-log">
     <div class="row column">
-        <h1>Event Log</h1>
+        <h1>Event log</h1>
     </div>
     <section class="row column">
         <div class="page-header">
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index ad936e7..fda154a 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -1,6 +1,6 @@
 <div id="sensors-overview">
     <div class="row column">
-        <h1>Sensors Data</h1>
+        <h1>Sensors data</h1>
     </div>
     <section class="row column">
         <div class="page-header">
diff --git a/app/server-health/controllers/unit-id-controller.html b/app/server-health/controllers/unit-id-controller.html
index 53bd242..a3e4c75 100644
--- a/app/server-health/controllers/unit-id-controller.html
+++ b/app/server-health/controllers/unit-id-controller.html
@@ -1,10 +1,10 @@
 <div id="uid-switch">
     <div class="row column">
-        <h1>Unit ID Indicator</h1>
+        <h1>Server indicator</h1>
     </div>
 
     <div class="row column">
-        <h2 class="h4">Unit ID control</h2>
+        <h2 class="h4">Server indicator control</h2>
     </div>
 
     <div class="row column" ng-class="{disabled: dataService.server_unreachable || dataService.loading}">
@@ -18,11 +18,11 @@
                        ng-checked="dataService.LED_state == 'on'"
                        ng-disabled="dataService.server_unreachable"
                        >
-                <label for="toggle__switch-round" tabindex="0">Unit ID indicator is <span class="uid-switch__status">{{dataService.LED_state}}</span></label>
+                <label for="toggle__switch-round" tabindex="0">Server indicator is <span class="uid-switch__status">{{dataService.LED_state}}</span></label>
             </div>
             <div class="uid-switch__label inline">
-                <p>Unit ID indicator is <span class="uid-switch__status">{{dataService.LED_state}}</span></p>
-                <p>Control unit indicator to identify server unit.</p>
+                <p>Server indicator is <span class="uid-switch__status">{{dataService.LED_state}}</span></p>
+                <p>Control unit indicator to identify server unit</p>
             </div>
         </div>
     </div>