diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 84c2887..1de2e52 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -1,31 +1,31 @@
 <div id="header__wrapper">
-	<!-- HEADER -->
-	<header id="header">
-		<span class="header__title float-left">OpenBMC</span>
-		<a href="" class="header__logout" ng-click="logout()">Log out</a>
-	</header>
-	<div class="header__functions-wrapper" role="heading">
-		<div class="logo__wrapper"><img src="../../assets/images/logo.svg" class="header__logo" alt="company logo"/></div>
-		<!-- <button class="inline header__multi-server" aria-label="multi server select" ng-class="{'active': multi_server_recent}" ng-click="multiRecent();">
-			<span class="icon icon-angle" aria-hidden="true"></span><span class="accessible-text">Multi server switcher</span>
-		</button>-->
-		<div class="inline header__server-name">
-			<p class="header__hostname">{{dataService.hostname}}</p>
-			<p class="header__server-ip courier-bold">BMC host/IP address {{dataService.server_id}}</p>
-		</div>
-		<div class="header__functions" ng-class="{'active' : toggle}">
-			<a class="header__info" ng-click="toggle = !toggle"><span>Server Info</span><i class="icon icon-angle" aria-hidden="true"></i></a>
-			<a href="#/server-health/event-log" class="header__server-health">Server health
-				<i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__error': dataService.server_health == 'Critical', 'status-light__warn': dataService.server_health == 'Warning', 'status-light__good': dataService.server_health == 'Good'}">{{dataService.server_health}}</span></a>
-			 <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power
-				<i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__error': dataService.server_state == 'Quiesced'}">{{dataService.server_state | quiescedToError}}</span></a>
-			<p class="header__refresh">Data last refreshed<span>{{dataService.last_updated | date:'medium'}}</span>
-			</p>
-			<button class="header__page-refresh" ng-click="refresh()" aria-label="refresh page data">
-				<span>Refresh</span>
-				<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52.18 51.91">
-					<path class="cls-1" d="M38,20.77H52v-14H48.3v6.07A26,26,0,1,0,48.7,38H44.32a22.14,22.14,0,1,1,1.8-20.92H38v3.67Z" transform="translate(0.16 0.14)"/>
-			</button>
-		</div>
-	</div>
+  <!-- HEADER -->
+  <header id="header">
+    <span class="header__title float-left">OpenBMC</span>
+    <a href="" class="header__logout" ng-click="logout()">Log out</a>
+  </header>
+  <div class="header__functions-wrapper" role="heading">
+    <div class="logo__wrapper"><img src="../../assets/images/logo.svg" class="header__logo" alt="company logo"/></div>
+    <!-- <button class="inline header__multi-server" aria-label="multi server select" ng-class="{'active': multi_server_recent}" ng-click="multiRecent();">
+      <span class="icon icon-angle" aria-hidden="true"></span><span class="accessible-text">Multi server switcher</span>
+    </button>-->
+    <div class="inline header__server-name">
+      <p class="header__hostname">{{dataService.hostname}}</p>
+      <p class="header__server-ip courier-bold">BMC host/IP address {{dataService.server_id}}</p>
+    </div>
+    <div class="header__functions" ng-class="{'active' : toggle}">
+      <a class="header__info" ng-click="toggle = !toggle"><span>Server Info</span><i class="icon icon-angle" aria-hidden="true"></i></a>
+      <a href="#/server-health/event-log" class="header__server-health">Server health
+        <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__error': dataService.server_health == 'Critical', 'status-light__warn': dataService.server_health == 'Warning', 'status-light__good': dataService.server_health == 'Good'}">{{dataService.server_health}}</span></a>
+       <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power
+        <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__error': dataService.server_state == 'Quiesced'}">{{dataService.server_state | quiescedToError}}</span></a>
+      <p class="header__refresh">Data last refreshed<span>{{dataService.last_updated | date:'medium'}}</span>
+      </p>
+      <button class="header__page-refresh" ng-click="refresh()" aria-label="refresh page data">
+        <span>Refresh</span>
+        <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52.18 51.91">
+          <path class="cls-1" d="M38,20.77H52v-14H48.3v6.07A26,26,0,1,0,48.7,38H44.32a22.14,22.14,0,1,1,1.8-20.92H38v3.67Z" transform="translate(0.16 0.14)"/>
+      </button>
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 32797c0..9438e85 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -1,115 +1,115 @@
 <nav class="nav__wrapper">
-	<ul id="nav__top-level" ng-style="navStyle">
-		<li>
-			<a class="btn-overview" ng-class="{opened: firstLevel == 'overview'}" href="#/overview/server" ng-click="change('overview')" tabindex="1">
-				<span class="">
-					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
-						<path d="M23.9,18.2l3.3,3.3l1.1-1.1L23.9,16l-7.8,7.8l-3.3-3.3l-1.1,1.1l4.4,4.4L23.9,18.2z"/>
-						<path d="M5,8v24h30V8H5z M33,30H7V12h26V30z"/>
-					</svg>
-					Server overview</span></a>
-		</li>
-		<li>
-			<button class="btn-health" ng-class="{opened: firstLevel == 'server-health'}" ng-click="change('server-health')" tabindex="2">
-				<span>
-					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
-						<polyline class="st0" points="32,12.9 32,16 8,16 8,8 27,8 "/>
-						<rect x="8" y="16" class="st0" width="24" height="8"/>
-						<rect x="8" y="24" class="st0" width="24" height="8"/>
-						<line class="st0" x1="19" y1="12" x2="27" y2="12"/>
-						<line class="st0" x1="11" y1="12" x2="13" y2="12"/>
-						<line class="st0" x1="19" y1="20" x2="27" y2="20"/>
-						<line class="st0" x1="11" y1="20" x2="13" y2="20"/>
-						<line class="st0" x1="19" y1="28" x2="27" y2="28"/>
-						<line class="st0" x1="11" y1="28" x2="13" y2="28"/>
-						<polygon points="36.4,4 37.5,5.1 32.4,10.2 29.5,7.4 30.7,6.2 32.4,8 "/>
-					</svg>
-					Server health
-				</span>
-			</button>
-		</li>
-		<li>
-			<button class="btn-control" ng-class="{opened: firstLevel == 'server-control'}" ng-click="change('server-control')" tabindex="3">
-				<span>
-					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
-						<line class="st0" x1="8" y1="12" x2="32" y2="12"/>
-						<line class="st0" x1="8" y1="20" x2="32" y2="20"/>
-						<line class="st0" x1="8" y1="28" x2="32" y2="28"/>
-						<line class="st1" x1="24" y1="28" x2="28" y2="28"/>
-						<line class="st1" x1="18" y1="20" x2="22" y2="20"/>
-						<line class="st1" x1="12" y1="12" x2="16" y2="12"/>
-					</svg>
-					Server control
-				</span>
-			</button>
-		</li>
-		<li>
-			<button class="btn-config" ng-class="{opened: firstLevel == 'configuration'}" ng-click="change('configuration')" tabindex="4">
-			<span>
-				<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
-					<path d="M31.5,20c0-0.6-0.1-1.2-0.2-1.8L35,15l-3.1-5.1l-4.4,1.4c-1.1-0.9-2.3-1.6-3.6-2.1L23,5h-6l-1,4.2c-1.3,0.5-2.5,1.2-3.6,2.1
-						L8.1,9.9L5,15l3.7,3.2c-0.1,0.6-0.2,1.2-0.2,1.8c0,0.6,0.1,1.2,0.2,1.8L5,25l3.1,5.1l4.4-1.4c1.1,0.9,2.3,1.6,3.6,2.1l1,4.2h6l1-4.2
-						c1.3-0.5,2.5-1.2,3.6-2.1l4.4,1.4L35,25l-3.7-3.2C31.4,21.2,31.5,20.6,31.5,20z M32.4,25.4L31,27.7l-2.9-0.9l-1.1-0.4l-0.9,0.7
-						c-0.9,0.8-1.9,1.3-2.9,1.7l-1,0.4L22,30.3L21.4,33h-2.8L18,30.3l-0.2-1.1l-1-0.4c-1.1-0.4-2.1-1-2.9-1.7l-0.9-0.7l-1.1,0.4L9,27.7
-						l-1.4-2.3l2.4-2.1l0.8-0.7l-0.2-1.1c-0.1-0.5-0.1-1-0.1-1.5c0-0.4,0-0.9,0.1-1.5l0.2-1.1L10,16.7l-2.4-2.1L9,12.3l2.9,0.9l1.1,0.4
-						l0.9-0.7c0.9-0.8,1.9-1.3,2.9-1.7l1-0.4L18,9.7L18.6,7h2.8L22,9.7l0.2,1.1l1,0.4c1.1,0.4,2.1,1,2.9,1.7l0.9,0.7l1.1-0.4l2.9-0.9
-						l1.4,2.3L30,16.7l-0.8,0.7l0.2,1.1c0.1,0.6,0.1,1,0.1,1.5s0,0.9-0.1,1.5l-0.2,1.1l0.8,0.7L32.4,25.4z"/>
-					<path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3C23,21.7,21.7,23,20,23z"/>
-				</svg>
-				Server configuration</span></button>
-		</li>
-		<li>
-			<button class="btn-users" ng-class="{opened: firstLevel == 'users'}" ng-click="change('users')" tabindex="5">
-				<span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" class="nav-icon"><path d="M16 21c5.523 0 10-4.477 10-10S21.523 1 16 1 6 5.477 6 11s4.477 10 10 10zm0-18c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zM24 23H8a4 4 0 0 0-4 4v4h24v-4a4 4 0 0 0-4-4z"/></svg></span>
-				<span>Users</span>
-			</button>
-		</li>
-		<!--<li class="btn-multi-server">
-			<a ng-class="{opened: firstLevel == 'multi-server'}" href="#/multi-server/overview" ng-click="change('multi-server')" tabindex="6">
-				<span>
-					<svg class="nav-icon" version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve">
+  <ul id="nav__top-level" ng-style="navStyle">
+    <li>
+      <a class="btn-overview" ng-class="{opened: firstLevel == 'overview'}" href="#/overview/server" ng-click="change('overview')" tabindex="1">
+        <span class="">
+          <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
+            <path d="M23.9,18.2l3.3,3.3l1.1-1.1L23.9,16l-7.8,7.8l-3.3-3.3l-1.1,1.1l4.4,4.4L23.9,18.2z"/>
+            <path d="M5,8v24h30V8H5z M33,30H7V12h26V30z"/>
+          </svg>
+          Server overview</span></a>
+    </li>
+    <li>
+      <button class="btn-health" ng-class="{opened: firstLevel == 'server-health'}" ng-click="change('server-health')" tabindex="2">
+        <span>
+          <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
+            <polyline class="st0" points="32,12.9 32,16 8,16 8,8 27,8 "/>
+            <rect x="8" y="16" class="st0" width="24" height="8"/>
+            <rect x="8" y="24" class="st0" width="24" height="8"/>
+            <line class="st0" x1="19" y1="12" x2="27" y2="12"/>
+            <line class="st0" x1="11" y1="12" x2="13" y2="12"/>
+            <line class="st0" x1="19" y1="20" x2="27" y2="20"/>
+            <line class="st0" x1="11" y1="20" x2="13" y2="20"/>
+            <line class="st0" x1="19" y1="28" x2="27" y2="28"/>
+            <line class="st0" x1="11" y1="28" x2="13" y2="28"/>
+            <polygon points="36.4,4 37.5,5.1 32.4,10.2 29.5,7.4 30.7,6.2 32.4,8 "/>
+          </svg>
+          Server health
+        </span>
+      </button>
+    </li>
+    <li>
+      <button class="btn-control" ng-class="{opened: firstLevel == 'server-control'}" ng-click="change('server-control')" tabindex="3">
+        <span>
+          <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
+            <line class="st0" x1="8" y1="12" x2="32" y2="12"/>
+            <line class="st0" x1="8" y1="20" x2="32" y2="20"/>
+            <line class="st0" x1="8" y1="28" x2="32" y2="28"/>
+            <line class="st1" x1="24" y1="28" x2="28" y2="28"/>
+            <line class="st1" x1="18" y1="20" x2="22" y2="20"/>
+            <line class="st1" x1="12" y1="12" x2="16" y2="12"/>
+          </svg>
+          Server control
+        </span>
+      </button>
+    </li>
+    <li>
+      <button class="btn-config" ng-class="{opened: firstLevel == 'configuration'}" ng-click="change('configuration')" tabindex="4">
+      <span>
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
+          <path d="M31.5,20c0-0.6-0.1-1.2-0.2-1.8L35,15l-3.1-5.1l-4.4,1.4c-1.1-0.9-2.3-1.6-3.6-2.1L23,5h-6l-1,4.2c-1.3,0.5-2.5,1.2-3.6,2.1
+            L8.1,9.9L5,15l3.7,3.2c-0.1,0.6-0.2,1.2-0.2,1.8c0,0.6,0.1,1.2,0.2,1.8L5,25l3.1,5.1l4.4-1.4c1.1,0.9,2.3,1.6,3.6,2.1l1,4.2h6l1-4.2
+            c1.3-0.5,2.5-1.2,3.6-2.1l4.4,1.4L35,25l-3.7-3.2C31.4,21.2,31.5,20.6,31.5,20z M32.4,25.4L31,27.7l-2.9-0.9l-1.1-0.4l-0.9,0.7
+            c-0.9,0.8-1.9,1.3-2.9,1.7l-1,0.4L22,30.3L21.4,33h-2.8L18,30.3l-0.2-1.1l-1-0.4c-1.1-0.4-2.1-1-2.9-1.7l-0.9-0.7l-1.1,0.4L9,27.7
+            l-1.4-2.3l2.4-2.1l0.8-0.7l-0.2-1.1c-0.1-0.5-0.1-1-0.1-1.5c0-0.4,0-0.9,0.1-1.5l0.2-1.1L10,16.7l-2.4-2.1L9,12.3l2.9,0.9l1.1,0.4
+            l0.9-0.7c0.9-0.8,1.9-1.3,2.9-1.7l1-0.4L18,9.7L18.6,7h2.8L22,9.7l0.2,1.1l1,0.4c1.1,0.4,2.1,1,2.9,1.7l0.9,0.7l1.1-0.4l2.9-0.9
+            l1.4,2.3L30,16.7l-0.8,0.7l0.2,1.1c0.1,0.6,0.1,1,0.1,1.5s0,0.9-0.1,1.5l-0.2,1.1l0.8,0.7L32.4,25.4z"/>
+          <path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3C23,21.7,21.7,23,20,23z"/>
+        </svg>
+        Server configuration</span></button>
+    </li>
+    <li>
+      <button class="btn-users" ng-class="{opened: firstLevel == 'users'}" ng-click="change('users')" tabindex="5">
+        <span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" class="nav-icon"><path d="M16 21c5.523 0 10-4.477 10-10S21.523 1 16 1 6 5.477 6 11s4.477 10 10 10zm0-18c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zM24 23H8a4 4 0 0 0-4 4v4h24v-4a4 4 0 0 0-4-4z"/></svg></span>
+        <span>Users</span>
+      </button>
+    </li>
+    <!--<li class="btn-multi-server">
+      <a ng-class="{opened: firstLevel == 'multi-server'}" href="#/multi-server/overview" ng-click="change('multi-server')" tabindex="6">
+        <span>
+          <svg class="nav-icon" version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve">
 <path d="M12.8,7.3h4c0.2,1.5,1.5,2.8,3.1,2.8c1.7,0,3.1-1.4,3.1-3.1s-1.4-3.1-3.1-3.1c-1.5,0-2.7,1-3,2.4h-4C12.4,3.3,9.9,1,6.9,1
-	C3.7,1,1,3.6,1,6.9c0,0,0,0,0,0c0,3.1,2.4,5.7,5.5,5.9v4c-1.3,0.4-2.4,1.6-2.4,3c0,1.7,1.4,3.1,3.1,3.1s3.1-1.4,3.1-3.1
-	c0-1.6-1.2-2.9-2.8-3.1v-4c1.1-0.2,2.1-0.6,2.9-1.3l4.7,4.7c-0.4,0.5-0.6,1.1-0.6,1.8c0,1.7,1.4,3.1,3.1,3.1c1.7,0,3.1-1.4,3.1-3.1
-	c0-1.7-1.4-3.1-3.1-3.1c-0.6,0-1.3,0.2-1.8,0.6l-4.7-4.7C12.2,9.7,12.7,8.5,12.8,7.3z M2.2,6.9c0-2.6,2.1-4.7,4.7-4.7
-	s4.7,2.1,4.7,4.7s-2.1,4.7-4.7,4.7S2.2,9.5,2.2,6.9z"/>
+  C3.7,1,1,3.6,1,6.9c0,0,0,0,0,0c0,3.1,2.4,5.7,5.5,5.9v4c-1.3,0.4-2.4,1.6-2.4,3c0,1.7,1.4,3.1,3.1,3.1s3.1-1.4,3.1-3.1
+  c0-1.6-1.2-2.9-2.8-3.1v-4c1.1-0.2,2.1-0.6,2.9-1.3l4.7,4.7c-0.4,0.5-0.6,1.1-0.6,1.8c0,1.7,1.4,3.1,3.1,3.1c1.7,0,3.1-1.4,3.1-3.1
+  c0-1.7-1.4-3.1-3.1-3.1c-0.6,0-1.3,0.2-1.8,0.6l-4.7-4.7C12.2,9.7,12.7,8.5,12.8,7.3z M2.2,6.9c0-2.6,2.1-4.7,4.7-4.7
+  s4.7,2.1,4.7,4.7s-2.1,4.7-4.7,4.7S2.2,9.5,2.2,6.9z"/>
 </svg>
-				All Servers</span></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="6" 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" tabindex="7">Hardware status</a></li>
-		<li ng-class="{'active': (path == '/server-health/sensors-overview' || path == '/server-health/sensors')}">
-			<a href="#/server-health/sensors-overview" ng-click="closeSubnav()" tabindex="8">Sensors</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')}">
-			<a href="#/server-control/power-operations" tabindex="9" ng-click="closeSubnav()">Server power operations</a>
-		</li>
-		<li ng-class="{'active': (path == '/server-control/power-usage')}">
-			<a href="#/server-control/power-usage" tabindex="10" ng-click="closeSubnav()">Manage power usage</a></li>
-		<li ng-class="{'active': (path == '/server-control/server-led')}">
-			<a href="#/server-control/server-led" tabindex="11" ng-click="closeSubnav()">Server LED</a></li>
-		<li ng-class="{'active': (path == '/server-control/bmc-reboot')}">
-			<a href="#/server-control/bmc-reboot" tabindex="12" ng-click="closeSubnav()">Reboot BMC</a></li>
-		<li ng-class="{'active': (path == '/server-control/remote-console')}">
-			<a href="#/server-control/remote-console" tabindex="13" ng-click="closeSubnav()">Serial over LAN console</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" tabindex="14" ng-click="closeSubnav()">Network settings</a></li>
-		<li ng-class="{'active': (path == '/configuration' || path == '/configuration/snmp')}">
-			<a href="#/configuration/snmp" tabindex="15" ng-click="closeSubnav()">SNMP settings</a></li>
-		<li ng-class="{'active': (path == '/configuration' || path == '/configuration/firmware')}">
-			<a href="#/configuration/firmware" tabindex="16" ng-click="closeSubnav()">Firmware</a></li>
-		<li ng-class="{'active': (path == '/configuration' || path == '/configuration/date-time')}">
-			<a href="#/configuration/date-time" tabindex="17" ng-click="closeSubnav()">Date and time settings</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" tabindex="18" ng-click="closeSubnav()">Manage user account</a></li>
-	</ul>
+        All Servers</span></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="6" 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" tabindex="7">Hardware status</a></li>
+    <li ng-class="{'active': (path == '/server-health/sensors-overview' || path == '/server-health/sensors')}">
+      <a href="#/server-health/sensors-overview" ng-click="closeSubnav()" tabindex="8">Sensors</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')}">
+      <a href="#/server-control/power-operations" tabindex="9" ng-click="closeSubnav()">Server power operations</a>
+    </li>
+    <li ng-class="{'active': (path == '/server-control/power-usage')}">
+      <a href="#/server-control/power-usage" tabindex="10" ng-click="closeSubnav()">Manage power usage</a></li>
+    <li ng-class="{'active': (path == '/server-control/server-led')}">
+      <a href="#/server-control/server-led" tabindex="11" ng-click="closeSubnav()">Server LED</a></li>
+    <li ng-class="{'active': (path == '/server-control/bmc-reboot')}">
+      <a href="#/server-control/bmc-reboot" tabindex="12" ng-click="closeSubnav()">Reboot BMC</a></li>
+    <li ng-class="{'active': (path == '/server-control/remote-console')}">
+      <a href="#/server-control/remote-console" tabindex="13" ng-click="closeSubnav()">Serial over LAN console</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" tabindex="14" ng-click="closeSubnav()">Network settings</a></li>
+    <li ng-class="{'active': (path == '/configuration' || path == '/configuration/snmp')}">
+      <a href="#/configuration/snmp" tabindex="15" ng-click="closeSubnav()">SNMP settings</a></li>
+    <li ng-class="{'active': (path == '/configuration' || path == '/configuration/firmware')}">
+      <a href="#/configuration/firmware" tabindex="16" ng-click="closeSubnav()">Firmware</a></li>
+    <li ng-class="{'active': (path == '/configuration' || path == '/configuration/date-time')}">
+      <a href="#/configuration/date-time" tabindex="17" ng-click="closeSubnav()">Date and time settings</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" tabindex="18" ng-click="closeSubnav()">Manage user account</a></li>
+  </ul>
 </nav>
diff --git a/app/common/directives/firmware-list.html b/app/common/directives/firmware-list.html
index 26423c9..55dd22e 100644
--- a/app/common/directives/firmware-list.html
+++ b/app/common/directives/firmware-list.html
@@ -1,66 +1,66 @@
 <div class="row column firmware__table">
-	<div class="table-header column small-12">
-		<p class="inline">{{title}}</p>
-		<p class="inline firmware__active-version">Functional firmware version: {{version}}</p>
-	</div>
-	<div class="table row column">
-		<div class="table__head">
-			<div class="table__row">
-				<div class="table__cell">
-					Boot priority
-				</div>
-				<div class="table__cell">
-					Image state
-				</div>
-				<div class="table__cell firmware__version">
-					Version
-				</div>
-				<div class="table__cell firmware__action">
-					Action
-				</div>
-			</div>
-		</div>
-		<div class="table__body">
-			<div class="table__row" ng-class="firmware.activationStatus == 'Functional' ? 'firmware__primary' : ''" ng-repeat="firmware in firmwares|filter:filterBy|orderBy:'+Priority' as imageList">
-				<div class="table__cell">
-					<span class="table__cell-label">Boot priority:</span>
-					<div class="icon icon__up-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$first}"
-					     ng-click="!$first && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority - 1)"
-					     ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Active'">
-						<span class="accessible-text">firmware up in priority</span></div>
-					<div class="icon icon__down-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$last || !['Active', 'Functional'].includes(imageList[$index+1].activationStatus)}"
-					    ng-click="(!$last && ['Active', 'Functional'].includes(imageList[$index + 1].activationStatus)) && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority + 2)"
-					    ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Active'">
-						<span class="accessible-text">firmware down in priority</span></div>
-				</div>
-				<div class="table__cell firmware__active">
-					<span class="table__cell-label">Image state:</span>
-					<span>{{firmware.activationStatus}}</span>
-				</div>
-				<div class="table__cell firmware__version" ng-class="{'active':firmware.isExtended}">
-					<span class="table__cell-label">Version:</span>{{firmware.Version}}
-					<div class="icon icon__more" ng-click="firmware.extended.show = ! firmware.extended.show"
-							ng-class="{'active':firmware.isExtended}" ng-show="firmware.isExtended">
-						<svg version="1.1" x="0px" y="0px" viewBox="0 0 24.3 24.6">
-							<path d="M12.1,23C6.1,23,1.3,18.2,1.3,12.3S6.1,1.6,12.1,1.6s10.7,4.8,10.7,10.7S18,23,12.1,23z M12.1,2.6c-5.4,0-9.7,4.4-9.7,9.7 S6.7,22,12.1,22s9.7-4.4,9.7-9.7S17.4,2.6,12.1,2.6z"/>
-							<g>
-								<circle cx="6.7" cy="12.5" r="1.5"/>
-								<circle cx="12.1" cy="12.5" r="1.5"/>
-								<circle cx="17.4" cy="12.5" r="1.5"/>
-							</g>
-						</svg>
-					</div>
-				</div>
-				<div class="icon__more-dropdown" ng-show="firmware.extended.show">
-					<h5 class="bold">Extended version information</h5>
-					<p class="no-margin" ng-repeat="version in firmware.extended.versions">{{version.title}}: {{version.version}}</p>
-				</div>
-				<div class="table__cell firmware__action">
-				    <span class="table__cell-label">Action:</span>
-				    <button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready' || firmware.activationStatus == 'Failed'" ng-click="activate(firmware.imageId, firmware.Version, firmware.imageType)">Activate</button>
-				    <button class="firmware__action-link" ng-show="firmware.activationStatus != 'Functional'" ng-click="delete(firmware.imageId, firmware.Version)">Delete</button>
-				</div>
-			</div>
-		</div>
-	</div>
+  <div class="table-header column small-12">
+    <p class="inline">{{title}}</p>
+    <p class="inline firmware__active-version">Functional firmware version: {{version}}</p>
+  </div>
+  <div class="table row column">
+    <div class="table__head">
+      <div class="table__row">
+        <div class="table__cell">
+          Boot priority
+        </div>
+        <div class="table__cell">
+          Image state
+        </div>
+        <div class="table__cell firmware__version">
+          Version
+        </div>
+        <div class="table__cell firmware__action">
+          Action
+        </div>
+      </div>
+    </div>
+    <div class="table__body">
+      <div class="table__row" ng-class="firmware.activationStatus == 'Functional' ? 'firmware__primary' : ''" ng-repeat="firmware in firmwares|filter:filterBy|orderBy:'+Priority' as imageList">
+        <div class="table__cell">
+          <span class="table__cell-label">Boot priority:</span>
+          <div class="icon icon__up-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$first}"
+               ng-click="!$first && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority - 1)"
+               ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Active'">
+            <span class="accessible-text">firmware up in priority</span></div>
+          <div class="icon icon__down-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$last || !['Active', 'Functional'].includes(imageList[$index+1].activationStatus)}"
+              ng-click="(!$last && ['Active', 'Functional'].includes(imageList[$index + 1].activationStatus)) && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority + 2)"
+              ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Active'">
+            <span class="accessible-text">firmware down in priority</span></div>
+        </div>
+        <div class="table__cell firmware__active">
+          <span class="table__cell-label">Image state:</span>
+          <span>{{firmware.activationStatus}}</span>
+        </div>
+        <div class="table__cell firmware__version" ng-class="{'active':firmware.isExtended}">
+          <span class="table__cell-label">Version:</span>{{firmware.Version}}
+          <div class="icon icon__more" ng-click="firmware.extended.show = ! firmware.extended.show"
+              ng-class="{'active':firmware.isExtended}" ng-show="firmware.isExtended">
+            <svg version="1.1" x="0px" y="0px" viewBox="0 0 24.3 24.6">
+              <path d="M12.1,23C6.1,23,1.3,18.2,1.3,12.3S6.1,1.6,12.1,1.6s10.7,4.8,10.7,10.7S18,23,12.1,23z M12.1,2.6c-5.4,0-9.7,4.4-9.7,9.7 S6.7,22,12.1,22s9.7-4.4,9.7-9.7S17.4,2.6,12.1,2.6z"/>
+              <g>
+                <circle cx="6.7" cy="12.5" r="1.5"/>
+                <circle cx="12.1" cy="12.5" r="1.5"/>
+                <circle cx="17.4" cy="12.5" r="1.5"/>
+              </g>
+            </svg>
+          </div>
+        </div>
+        <div class="icon__more-dropdown" ng-show="firmware.extended.show">
+          <h5 class="bold">Extended version information</h5>
+          <p class="no-margin" ng-repeat="version in firmware.extended.versions">{{version.title}}: {{version.version}}</p>
+        </div>
+        <div class="table__cell firmware__action">
+            <span class="table__cell-label">Action:</span>
+            <button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready' || firmware.activationStatus == 'Failed'" ng-click="activate(firmware.imageId, firmware.Version, firmware.imageType)">Activate</button>
+            <button class="firmware__action-link" ng-show="firmware.activationStatus != 'Functional'" ng-click="delete(firmware.imageId, firmware.Version)">Delete</button>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/app/common/directives/loader.html b/app/common/directives/loader.html
index fd6e0cb..d3026dc 100644
--- a/app/common/directives/loader.html
+++ b/app/common/directives/loader.html
@@ -1,4 +1,4 @@
 <div class="loader__wrapper" ng-show="loading"><svg class="loader" viewBox="25 25 50 50">
-	<circle class="loader__path" cx="50" cy="50" r="20"/></circle>
+  <circle class="loader__path" cx="50" cy="50" r="20"/></circle>
 </svg></div>
 <div class="loader__overlay" ng-show="loading"></div>
\ No newline at end of file
diff --git a/app/common/directives/log-search-control.html b/app/common/directives/log-search-control.html
index 5d2246c..6d3dbfd 100644
--- a/app/common/directives/log-search-control.html
+++ b/app/common/directives/log-search-control.html
@@ -3,7 +3,7 @@
     <label for="content__search-input">Event Log Search</label>
     <input id="content__search-input" type="text" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
     <div class="search-submit__wrapper">
-		<button class="clear-input" ng-click="clear()">&#10005;</button>
+    <button class="clear-input" ng-click="clear()">&#10005;</button>
         <input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/common/directives/serial-console.html b/app/common/directives/serial-console.html
index 7238f54..cf451aa 100644
--- a/app/common/directives/serial-console.html
+++ b/app/common/directives/serial-console.html
@@ -1,6 +1,6 @@
 <div class="serial-lan__wrapper">
-	<div id="terminal"></div>
-	<div class="serial-lan__actions">
-		<button class="inline btn-pop-out" ng-click="openTerminalWindow()" ng-show="showTabBtn === true">Open in new tab</button>
-	</div>
+  <div id="terminal"></div>
+  <div class="serial-lan__actions">
+    <button class="inline btn-pop-out" ng-click="openTerminalWindow()" ng-show="showTabBtn === true">Open in new tab</button>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/configuration/controllers/date-time-controller.html b/app/configuration/controllers/date-time-controller.html
index 31c62ab..98bc66d 100644
--- a/app/configuration/controllers/date-time-controller.html
+++ b/app/configuration/controllers/date-time-controller.html
@@ -1,70 +1,70 @@
 <loader loading="loading"></loader>
 <div id="configuration-date-time">
-	<div class="row column">
-		<h1>Date and time settings</h1>
-	</div>
-	<form class="time__form" role="form" action="">
-		<div class="page-header">
-			<h2 class="bold h4">Date and time set to Network Time Protocol (NTP) or manually</h2>
-		</div>
-		<fieldset>
-			<div class="column large-8">
-				<div class="row column">
-					<label class="control-radio" for="ntp-time">Obtain Automatically from a Network Time Protocol (NTP) Server
-						<input type="radio" id="ntp-time" ng-model="time_mode" value="NTP">
-						<span class="control__indicator control__indicator-on"></span>
-					</label>
-				</div>
-				<div class="row column date-time__ntp-servers-wrap">
-					<fieldset class="date-time__ntp-servers" ng-repeat="server in ntp.servers track by $index">
-						<label for="ntp-server{{$index+1}}">NTP Server Address {{$index+1}}</label>
-						<div class="inline">
-							<input id="ntp-server{{$index+1}}" type="text" ng-readonly="time_mode != 'NTP'" ng-model="server" ng-blur="ntp.servers[$index] = server" set-focus-on-new-input/>
-						</div>
-						<button class="date-time__dns-remove inline" ng-click="removeNTPField($index)">Remove</button>
-					</fieldset>
-				</div>
-				<div class="row column date-time__ntp-servers-wrap">
-					<button type="button" class="btn-primary block" ng-click="addNTPField()">Add new NTP server</button>
-				</div>
-				<div class="row column">
-					<label class="control-radio" for="manual-time">Manually set date and time
-						<input type="radio" id="manual-time" ng-model="time_mode" value="Manual"/>
-						<span class="control__indicator control__indicator-on"></span>
-					</label>
-				</div>
-				<ul class="date-time__metadata-wrapper">
-					<li class="date-time__metadata-block">
-						<p class="content-label">BMC <span ng-if="time_owner != 'Split'">and Host</span> Time</p>
-						<div class="inline">
-							<input type="date" ng-model="bmc.date" ng-readonly="time_mode == 'NTP'" min="2018-01-01" max="2099-12-31"/>
-							<input type="time" ng-model="bmc.date" ng-readonly="time_mode == 'NTP'" />
-							<p class="courier-bold">{{bmc.timezone}}</p>
-						</div>
-					</li>
-					<li class="date-time__metadata-block" ng-if="time_owner == 'Split'">
-						<p class="content-label">Host Time</p>
-						<div class="inline">
-							<!--- Ideally, would just use one input, datetime-local, but datetime-local is not supported on Firefox.--->
-							<input type="date" ng-model="host.date" min="2018-01-01" max="2099-12-31"/>
-							<input type="time" ng-model="host.date"/>
-							<p class="courier-bold">{{host.timezone}}</p>
-						</div>
-					</li>
-					<li class="date-time__metadata-block">
-					<label class="content-label">Time Owner</label>
-					<select ng-model="time_owner" class="date-time__owner-dropdown">
-						<option class="courier-bold" ng-repeat="owner in time_owners">{{owner}}</option>
-					</select>
-					</li>
-				</ul>
-			</div>
-		</fieldset>
-		<div class="time__submit-wrapper">
-			<button type="button" class="btn-primary inline" ng-click="setTime()">Save settings</button>
-			<button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
-		</div>
-		<p class="success-msg" ng-show="set_time_success" role="alert">Success! Time changed!</p>
-		<p class="set_time_error error-msg" ng-show="set_time_error" role="alert">Error setting time!</p>
-	</form>
+  <div class="row column">
+    <h1>Date and time settings</h1>
+  </div>
+  <form class="time__form" role="form" action="">
+    <div class="page-header">
+      <h2 class="bold h4">Date and time set to Network Time Protocol (NTP) or manually</h2>
+    </div>
+    <fieldset>
+      <div class="column large-8">
+        <div class="row column">
+          <label class="control-radio" for="ntp-time">Obtain Automatically from a Network Time Protocol (NTP) Server
+            <input type="radio" id="ntp-time" ng-model="time_mode" value="NTP">
+            <span class="control__indicator control__indicator-on"></span>
+          </label>
+        </div>
+        <div class="row column date-time__ntp-servers-wrap">
+          <fieldset class="date-time__ntp-servers" ng-repeat="server in ntp.servers track by $index">
+            <label for="ntp-server{{$index+1}}">NTP Server Address {{$index+1}}</label>
+            <div class="inline">
+              <input id="ntp-server{{$index+1}}" type="text" ng-readonly="time_mode != 'NTP'" ng-model="server" ng-blur="ntp.servers[$index] = server" set-focus-on-new-input/>
+            </div>
+            <button class="date-time__dns-remove inline" ng-click="removeNTPField($index)">Remove</button>
+          </fieldset>
+        </div>
+        <div class="row column date-time__ntp-servers-wrap">
+          <button type="button" class="btn-primary block" ng-click="addNTPField()">Add new NTP server</button>
+        </div>
+        <div class="row column">
+          <label class="control-radio" for="manual-time">Manually set date and time
+            <input type="radio" id="manual-time" ng-model="time_mode" value="Manual"/>
+            <span class="control__indicator control__indicator-on"></span>
+          </label>
+        </div>
+        <ul class="date-time__metadata-wrapper">
+          <li class="date-time__metadata-block">
+            <p class="content-label">BMC <span ng-if="time_owner != 'Split'">and Host</span> Time</p>
+            <div class="inline">
+              <input type="date" ng-model="bmc.date" ng-readonly="time_mode == 'NTP'" min="2018-01-01" max="2099-12-31"/>
+              <input type="time" ng-model="bmc.date" ng-readonly="time_mode == 'NTP'" />
+              <p class="courier-bold">{{bmc.timezone}}</p>
+            </div>
+          </li>
+          <li class="date-time__metadata-block" ng-if="time_owner == 'Split'">
+            <p class="content-label">Host Time</p>
+            <div class="inline">
+              <!--- Ideally, would just use one input, datetime-local, but datetime-local is not supported on Firefox.--->
+              <input type="date" ng-model="host.date" min="2018-01-01" max="2099-12-31"/>
+              <input type="time" ng-model="host.date"/>
+              <p class="courier-bold">{{host.timezone}}</p>
+            </div>
+          </li>
+          <li class="date-time__metadata-block">
+          <label class="content-label">Time Owner</label>
+          <select ng-model="time_owner" class="date-time__owner-dropdown">
+            <option class="courier-bold" ng-repeat="owner in time_owners">{{owner}}</option>
+          </select>
+          </li>
+        </ul>
+      </div>
+    </fieldset>
+    <div class="time__submit-wrapper">
+      <button type="button" class="btn-primary inline" ng-click="setTime()">Save settings</button>
+      <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
+    </div>
+    <p class="success-msg" ng-show="set_time_success" role="alert">Success! Time changed!</p>
+    <p class="set_time_error error-msg" ng-show="set_time_error" role="alert">Error setting time!</p>
+  </form>
 </div>
diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index e79913b..5c81140 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -1,164 +1,164 @@
 <loader loading="loading"></loader>
 <div class="row column">
-	<h1>Firmware</h1>
-	<div class="column small-12 page-header">
-		<h2 class="inline h4">Manage BMC and server firmware</h2>
-	</div>
+  <h1>Firmware</h1>
+  <div class="column small-12 page-header">
+    <h2 class="inline h4">Manage BMC and server firmware</h2>
+  </div>
 </div>
 <div class="row column">
-	<p>Use the following tables to manage firmware image files. The image file that is listed at the top, the image with the highest boot priority, is used the next time that the device is booted. To change the boot priority for the image, click the arrow icons.</p>
-	<p><a ng-click="gotoAnchor()">Scroll down to upload an image file</a> to transfer a new firmware image to the BMC. After uploading a new image, Activate it to make it available for use.</p>
+  <p>Use the following tables to manage firmware image files. The image file that is listed at the top, the image with the highest boot priority, is used the next time that the device is booted. To change the boot priority for the image, click the arrow icons.</p>
+  <p><a ng-click="gotoAnchor()">Scroll down to upload an image file</a> to transfer a new firmware image to the BMC. After uploading a new image, Activate it to make it available for use.</p>
 </div>
 <firmware-list title="BMC images" version="bmcActiveVersion" firmwares="firmwares" filter-by="filters.bmc"></firmware-list>
 <firmware-list title="Server images" version="hostActiveVersion" firmwares="firmwares" filter-by="filters.host"></firmware-list>
 <div class="row column" id="upload">
-	<div class="column small-12 page-header">
-		<h2 class="inline h3 bold">Specify image file location</h2>
-	</div>
-	<form id="firmware__upload-form" role="form" class="firmware__upload-form">
-		<p>Specify an image file located on your workstation or a TFTP server. An image file may contain firmware images for the server, BMC, or other hardware devices. Each image that you upload will be unpacked from the image file and added to the appropriate list above.</p>
-		<div class=" column firmware__upload-station">
-			<h3 class="h4 bold">Upload image file from workstation</h3>
-			<p>Select the image file saved on the workstation storage medium to upload to the server BMC.</p>
-			<label for="file-upload" class="inline firmware__upload-chooser">
-				<input id="file-upload" type="file" file="file" class="hide" onchange="angular.element(this).scope().fileNameChanged()"/>
-				<span class="button btn-secondary inline">Choose a file</span>
-				<span class="inline firmware__upload-file-name"><span ng-if="!file">No file chosen</span><span ng-if="file.name !== undefined">{{file.name}}</span></span>
-			</label>
-			<input type="button" value="Upload firmware" class="inline button btn-primary float-right" ng-click="upload()"/>
-			<div class="inline uploading" ng-show="uploading">Upload in progress...</div>
-			<p class="download_success" ng-show="upload_success" role="alert">{{file ? '' : 'Upload complete. Check image tables above.'}}</p>
-		</div>
-		<div class=" column firmware__upload-tftp">
-			<h3 class="h4 bold">Download image file from TFTP server</h3>
-			<p>Specify both the TFTP server IP address and the image file name stored on it to download to the server BMC.</p>
-			<fieldset>
-				<div class="row">
-					<div class="column small-12 large-4">
-						<label for="tftp-ip">TFTP Server IP address</label>
-						<input name="tftp-ip" id="tftp-ip" type="text"  ng-model="download_host"/>
-					</div>
-					<div class="column small-12 large-4">
-						<label for="tftp-file-name">File name</label>
-						<input name="tftp-file-name" id="tftp-file-name" type="text"  ng-model="download_filename"/>
-					</div>
-					<div class="column small-12 large-4">
-						<input type="button" value="Download firmware" class="inline button btn-primary float-right" ng-click="download()"/>
-					</div>
-				</div>
-				<div class="inline uploading" ng-show="downloading">Downloading in progress...</div>
-				<p class="download_error error-msg" ng-show="download_error_msg" role="alert">{{download_error_msg}}</p>
-				<p class="download_success" ng-show="download_success" role="alert">Download complete. Check image tables above.</p>
-			</fieldset>
-		</div>
-	</form>
+  <div class="column small-12 page-header">
+    <h2 class="inline h3 bold">Specify image file location</h2>
+  </div>
+  <form id="firmware__upload-form" role="form" class="firmware__upload-form">
+    <p>Specify an image file located on your workstation or a TFTP server. An image file may contain firmware images for the server, BMC, or other hardware devices. Each image that you upload will be unpacked from the image file and added to the appropriate list above.</p>
+    <div class=" column firmware__upload-station">
+      <h3 class="h4 bold">Upload image file from workstation</h3>
+      <p>Select the image file saved on the workstation storage medium to upload to the server BMC.</p>
+      <label for="file-upload" class="inline firmware__upload-chooser">
+        <input id="file-upload" type="file" file="file" class="hide" onchange="angular.element(this).scope().fileNameChanged()"/>
+        <span class="button btn-secondary inline">Choose a file</span>
+        <span class="inline firmware__upload-file-name"><span ng-if="!file">No file chosen</span><span ng-if="file.name !== undefined">{{file.name}}</span></span>
+      </label>
+      <input type="button" value="Upload firmware" class="inline button btn-primary float-right" ng-click="upload()"/>
+      <div class="inline uploading" ng-show="uploading">Upload in progress...</div>
+      <p class="download_success" ng-show="upload_success" role="alert">{{file ? '' : 'Upload complete. Check image tables above.'}}</p>
+    </div>
+    <div class=" column firmware__upload-tftp">
+      <h3 class="h4 bold">Download image file from TFTP server</h3>
+      <p>Specify both the TFTP server IP address and the image file name stored on it to download to the server BMC.</p>
+      <fieldset>
+        <div class="row">
+          <div class="column small-12 large-4">
+            <label for="tftp-ip">TFTP Server IP address</label>
+            <input name="tftp-ip" id="tftp-ip" type="text"  ng-model="download_host"/>
+          </div>
+          <div class="column small-12 large-4">
+            <label for="tftp-file-name">File name</label>
+            <input name="tftp-file-name" id="tftp-file-name" type="text"  ng-model="download_filename"/>
+          </div>
+          <div class="column small-12 large-4">
+            <input type="button" value="Download firmware" class="inline button btn-primary float-right" ng-click="download()"/>
+          </div>
+        </div>
+        <div class="inline uploading" ng-show="downloading">Downloading in progress...</div>
+        <p class="download_error error-msg" ng-show="download_error_msg" role="alert">{{download_error_msg}}</p>
+        <p class="download_success" ng-show="download_success" role="alert">Download complete. Check image tables above.</p>
+      </fieldset>
+    </div>
+  </form>
 </div>
 
 <!-- Firmware modals -->
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': display_error}">
-	<div class="modal__upload-fail" role="document">
-		<div class="screen-reader-offscreen modal-description">{{error.modal_title}}</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<span class="icon icon__warning inline"><span class="accessible-text" role="alert">{{error.type}}</span></span>
-			<h1 class="modal-title h4 inline">{{error.title}}</h1>
-		</div>
-		<div class="modal__content">
-			<p>{{error.desc}}</p>
-		</div>
-		<div class="modal__button-wrapper">
-			<button class="inline btn-primary" ng-click="display_error = false;">Close</button>
-		</div>
-	</div>
+  <div class="modal__upload-fail" role="document">
+    <div class="screen-reader-offscreen modal-description">{{error.modal_title}}</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <span class="icon icon__warning inline"><span class="accessible-text" role="alert">{{error.type}}</span></span>
+      <h1 class="modal-title h4 inline">{{error.title}}</h1>
+    </div>
+    <div class="modal__content">
+      <p>{{error.desc}}</p>
+    </div>
+    <div class="modal__button-wrapper">
+      <button class="inline btn-primary" ng-click="display_error = false;">Close</button>
+    </div>
+  </div>
 </section>
 
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': confirm_priority}">
-	<div class="modal__tftp-unreachable" role="document">
-		<div class="screen-reader-offscreen modal-description">Update image priority</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<span class="icon icon__warning inline"><span class="accessible-text" role="alert">Warning</span></span>
-			<h1 class="modal-title h4 inline">Change image priority</h1>
-		</div>
-		<div class="modal__content">
-			<p>Change firmware {{priority_image_version}} priority?</p>
-		</div>
-		<div class="modal__button-wrapper">
-			<button class="inline btn-secondary" ng-click="confirm_priority=false;">Cancel</button>
-			<button class="inline btn-primary" ng-click="confirmChangePriority()">Continue</button>
-		</div>
-	</div>
+  <div class="modal__tftp-unreachable" role="document">
+    <div class="screen-reader-offscreen modal-description">Update image priority</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <span class="icon icon__warning inline"><span class="accessible-text" role="alert">Warning</span></span>
+      <h1 class="modal-title h4 inline">Change image priority</h1>
+    </div>
+    <div class="modal__content">
+      <p>Change firmware {{priority_image_version}} priority?</p>
+    </div>
+    <div class="modal__button-wrapper">
+      <button class="inline btn-secondary" ng-click="confirm_priority=false;">Cancel</button>
+      <button class="inline btn-primary" ng-click="confirmChangePriority()">Continue</button>
+    </div>
+  </div>
 </section>
 
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': confirm_delete}">
-	<div class="modal__tftp-unreachable" role="document">
-		<div class="screen-reader-offscreen modal-description">Delete firmware image</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<span class="icon icon__warning inline"><span class="accessible-text" role="alert">Warning</span></span>
-			<h1 class="modal-title h4 inline">Delete image</h1>
-		</div>
-		<div class="modal__content">
-			<p>Delete firmware {{delete_image_version}}?</p>
-		</div>
-		<div class="modal__button-wrapper">
-			<button class="inline btn-secondary" ng-click="confirm_delete=false;">Cancel</button>
-			<button class="inline btn-primary" ng-click="confirmDeleteImage()">Continue</button>
-		</div>
-	</div>
+  <div class="modal__tftp-unreachable" role="document">
+    <div class="screen-reader-offscreen modal-description">Delete firmware image</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <span class="icon icon__warning inline"><span class="accessible-text" role="alert">Warning</span></span>
+      <h1 class="modal-title h4 inline">Delete image</h1>
+    </div>
+    <div class="modal__content">
+      <p>Delete firmware {{delete_image_version}}?</p>
+    </div>
+    <div class="modal__button-wrapper">
+      <button class="inline btn-secondary" ng-click="confirm_delete=false;">Cancel</button>
+      <button class="inline btn-primary" ng-click="confirmDeleteImage()">Continue</button>
+    </div>
+  </div>
 </section>
 
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': activate_confirm}">
-	<div class="modal__activate" role="document">
-		<div class="screen-reader-offscreen modal-description">Activate modal</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 32 32"><path
-					d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
-					d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
-				<!-- We call "Host" firmware "server" firmware -->
-				Confirm {{activate_image_type == 'Host' ? 'server' : activate_image_type}} firmware file activation
-			</h1>
-		</div>
-		<div class="modal__content">
-			<div ng-switch on="activate_image_type">
-				<p ng-switch-when="BMC">When you activate the BMC firmware file, {{activate_image_version}}, the BMC must be rebooted before it will operate with the new firmware code. Note that when you reboot the BMC, the BMC will be unavailable for several minutes and you must log in again.</p>
-				<p ng-switch-when="Host">When you activate the server firmware file, {{activate_image_version}}, the new firmware will not operate until the next time the server boots.</p>
-			</div>
-			<form ng-if="activate_image_type == 'BMC'">
-				<fieldset>
-					<div class="row column">
-						<label class="control-radio bold" for="activate-without-reboot">Activate firmware file without rebooting BMC
-							<input type="radio" name="activate-without-reboot" id="activate-without-reboot" ng-model="activate.reboot" ng-value="false"/>
-							<span class="control__indicator control__indicator-on"></span>
-						</label>
-					</div>
-					<div class="row column">
-						<label class="control-radio bold" for="activate-with-reboot">Activate firmware file and automatically reboot BMC
-							<input type="radio" name="activate-with-reboot" id="activate-with-reboot" ng-model="activate.reboot" ng-value="true"/>
-							<span class="control__indicator control__indicator-on"></span>
-						</label>
-					</div>
-				</fieldset>
-			</form>
-			<form ng-if="activate_image_type == 'Host'">
-				<fieldset>
-					<div class="row column">
-						<label class="control-radio bold" for="activate-host-without-reboot">Activate firmware file without {{isServerOff() ? "booting" : "rebooting"}} server
-							<input type="radio" name="activate-host-without-reboot" id="activate-host-without-reboot" ng-model="activate.reboot" ng-value="false"/>
-							<span class="control__indicator control__indicator-on"></span>
-						</label>
-					</div>
-					<div class="row column">
-						<label class="control-radio bold" for="activate-host-with-reboot">Activate firmware file and automatically {{isServerOff() ? "boot" : "reboot"}} server
-							<input type="radio" name="activate-host-with-reboot" id="activate-host-with-reboot" ng-model="activate.reboot" ng-value="true"/>
-							<span class="control__indicator control__indicator-on"></span>
-						</label>
-					</div>
-				</fieldset>
-			</form>
-		</div>
-		<div class="modal__button-wrapper">
-			<button class="inline btn-secondary" ng-click="activate_confirm=false;">Cancel</button>
-			<button class="inline btn-primary" ng-click="activateConfirmed()">Continue</button>
-		</div>
-	</div>
+  <div class="modal__activate" role="document">
+    <div class="screen-reader-offscreen modal-description">Activate modal</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 32 32"><path
+          d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
+          d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
+        <!-- We call "Host" firmware "server" firmware -->
+        Confirm {{activate_image_type == 'Host' ? 'server' : activate_image_type}} firmware file activation
+      </h1>
+    </div>
+    <div class="modal__content">
+      <div ng-switch on="activate_image_type">
+        <p ng-switch-when="BMC">When you activate the BMC firmware file, {{activate_image_version}}, the BMC must be rebooted before it will operate with the new firmware code. Note that when you reboot the BMC, the BMC will be unavailable for several minutes and you must log in again.</p>
+        <p ng-switch-when="Host">When you activate the server firmware file, {{activate_image_version}}, the new firmware will not operate until the next time the server boots.</p>
+      </div>
+      <form ng-if="activate_image_type == 'BMC'">
+        <fieldset>
+          <div class="row column">
+            <label class="control-radio bold" for="activate-without-reboot">Activate firmware file without rebooting BMC
+              <input type="radio" name="activate-without-reboot" id="activate-without-reboot" ng-model="activate.reboot" ng-value="false"/>
+              <span class="control__indicator control__indicator-on"></span>
+            </label>
+          </div>
+          <div class="row column">
+            <label class="control-radio bold" for="activate-with-reboot">Activate firmware file and automatically reboot BMC
+              <input type="radio" name="activate-with-reboot" id="activate-with-reboot" ng-model="activate.reboot" ng-value="true"/>
+              <span class="control__indicator control__indicator-on"></span>
+            </label>
+          </div>
+        </fieldset>
+      </form>
+      <form ng-if="activate_image_type == 'Host'">
+        <fieldset>
+          <div class="row column">
+            <label class="control-radio bold" for="activate-host-without-reboot">Activate firmware file without {{isServerOff() ? "booting" : "rebooting"}} server
+              <input type="radio" name="activate-host-without-reboot" id="activate-host-without-reboot" ng-model="activate.reboot" ng-value="false"/>
+              <span class="control__indicator control__indicator-on"></span>
+            </label>
+          </div>
+          <div class="row column">
+            <label class="control-radio bold" for="activate-host-with-reboot">Activate firmware file and automatically {{isServerOff() ? "boot" : "reboot"}} server
+              <input type="radio" name="activate-host-with-reboot" id="activate-host-with-reboot" ng-model="activate.reboot" ng-value="true"/>
+              <span class="control__indicator control__indicator-on"></span>
+            </label>
+          </div>
+        </fieldset>
+      </form>
+    </div>
+    <div class="modal__button-wrapper">
+      <button class="inline btn-secondary" ng-click="activate_confirm=false;">Cancel</button>
+      <button class="inline btn-primary" ng-click="activateConfirmed()">Continue</button>
+    </div>
+  </div>
 </section>
 <div class="modal-overlay" tabindex="-1" ng-class="{'active': (display_error || activate_confirm)}"></div>
diff --git a/app/configuration/controllers/network-controller.html b/app/configuration/controllers/network-controller.html
index 39a708a..3b2567c 100644
--- a/app/configuration/controllers/network-controller.html
+++ b/app/configuration/controllers/network-controller.html
@@ -1,113 +1,113 @@
 <loader loading="loading"></loader>
 <div id="configuration-network">
-	<div class="row column">
-		<h1>BMC network settings</h1>
-	</div>
-	<form class="net-config__form" role="form" action="">
-		<section class="row column">
-			<div class="column small-12 page-header">
-				<h2 class="inline h4">Common settings</h2>
-			</div>
-			<fieldset>
-				<div class="column small-12 large-3">
-					<label for="net-config__mac">Hostname</label>
-					<input id="net-config__mac" type="text" ng-model="hostname"/>
-				</div>
-				<div class="column small-12 large-3">
-					<label for="netinterface-select">Network interface</label>
-					<div id="netinterface-select" class="dropdown__wrapper">
-						<button type="button" class="dropdown__button" ng-click="networkDevice = !networkDevice">{{selectedInterface}}</button>
-						<ul class="dropdown__list inline" ng-show="networkDevice">
-							<li ng-repeat="interface_id in network.interface_ids">
-								<button type="button" ng-click="selectInterface(interface_id);">{{interface_id}}</button>
-							</li>
-						</ul>
-					</div>
-				</div>
-				<div class="column small-12 large-3">
-					<label for="net-config__host">MAC address</label>
-					<input id="net-config__host" type="text" ng-model="interface.MACAddress"/>
-				</div>
-				<div class="column small-12 large-3">
-					<label for="net-config__domain">Default Gateway</label>
-					<input id="net-config__domain" type="text" ng-model="defaultgateway"/>
-				</div>
-			</fieldset>
-		</section>
-		<section class="row column">
-			<div class="column small-12 page-header">
-				<h2 class="inline h4">IPV4 settings</h2>
-			</div>
-			<fieldset>
-				<div class="row column">
-					<label class="control-radio" for="dhcp-address">Obtain an IP address automatically using DHCP
-						<input type="radio" name="ip-address" id="dhcp-address" ng-checked="true" ng-model="interface.DHCPEnabled" ng-value="true">
-						<span class="control__indicator control__indicator-on"></span>
-					</label>
-				</div>
-				<div class="row column">
-					<label class="control-radio" for="static-ip-address">Assign a static IP address
-						<input type="radio" name="ip-address" id="static-ip-address" ng-model="interface.DHCPEnabled" ng-value="false"/>
-						<span class="control__indicator control__indicator-on"></span>
-					</label>
-				</div>
-				<fieldset class="net-config__static-ip-wrap" ng-repeat="ipv4 in interface.ipv4.values">
-					<div class="column small-12 large-4">
-						<label for="net-config__ipv4-address" class="inline">IPV4 address</label>
-						<input id="net-config__ipv4-address" type="text" ng-disabled="interface.DHCPEnabled" ng-model="ipv4.Address"/>
-					</div>
-					<div class="column small-12 large-4">
-						<label for="net-config__subnet" class="inline">Gateway</label>
-						<input id="net-config__subnet" type="text" ng-disabled="interface.DHCPEnabled" value="" ng-model="ipv4.Gateway"/>
-					</div>
-					<!-- This netmask prefix length max only works with IPV4 -->
-					<div class="column small-12 large-4">
-						<label for="net-config__default-gateway" class="inline">Netmask Prefix Length</label>
-						<input id="net-config__default-gateway" type="number" min="1" max="32" step="1" ng-disabled="interface.DHCPEnabled"  ng-model="ipv4.PrefixLength"/>
-					</div>
-				</fieldset>
-			</fieldset>
-		</section>
-		<section class="row column">
-			<div class="column small-12 page-header">
-				<h2 class="inline h4">DNS settings</h2>
-			</div>
-			<fieldset>
-				<!-- Call Nameservers "DNS Servers" on the GUI -->
-				<fieldset class="net-config__static-ip-wrap" ng-repeat="dns in interface.Nameservers track by $index">
-					<div class="column small-12">
-						<label for="net-config__prime-dns{{$index+1}}">DNS Server {{$index+1}}</label>
-						<input id="net-config__prime-dns{{$index+1}}" class="network-input column small-6 large-4 inline" type="text" ng-model="dns" ng-blur="interface.Nameservers[$index] = dns" set-focus-on-new-input//>
-						<button class="dns__server-remove inline" ng-click="removeDNSField($index)">Remove</button>
-					</div>
-				</fieldset>
-				<div class="column small-12">
-					<button type="button" class="btn-primary inline dns_add" ng-click="addDNSField()">Add new DNS server</button>
-				</div>
-			</fieldset>
-			<div class="network-config__submit-wrapper">
-				<button type="button" class="btn-primary inline" ng-click="confirm_settings=true;">Save settings</button>
-				<button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
-			</div>
-			<p class="success-msg set_network_success" ng-show="set_network_success" role="alert">Success! Network settings changed!</p>
-			<p class="set_network_error error-msg" ng-show="set_network_error" role="alert">Error setting {{set_network_error}}!</p>
-		</section>
-	</form>
+  <div class="row column">
+    <h1>BMC network settings</h1>
+  </div>
+  <form class="net-config__form" role="form" action="">
+    <section class="row column">
+      <div class="column small-12 page-header">
+        <h2 class="inline h4">Common settings</h2>
+      </div>
+      <fieldset>
+        <div class="column small-12 large-3">
+          <label for="net-config__mac">Hostname</label>
+          <input id="net-config__mac" type="text" ng-model="hostname"/>
+        </div>
+        <div class="column small-12 large-3">
+          <label for="netinterface-select">Network interface</label>
+          <div id="netinterface-select" class="dropdown__wrapper">
+            <button type="button" class="dropdown__button" ng-click="networkDevice = !networkDevice">{{selectedInterface}}</button>
+            <ul class="dropdown__list inline" ng-show="networkDevice">
+              <li ng-repeat="interface_id in network.interface_ids">
+                <button type="button" ng-click="selectInterface(interface_id);">{{interface_id}}</button>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div class="column small-12 large-3">
+          <label for="net-config__host">MAC address</label>
+          <input id="net-config__host" type="text" ng-model="interface.MACAddress"/>
+        </div>
+        <div class="column small-12 large-3">
+          <label for="net-config__domain">Default Gateway</label>
+          <input id="net-config__domain" type="text" ng-model="defaultgateway"/>
+        </div>
+      </fieldset>
+    </section>
+    <section class="row column">
+      <div class="column small-12 page-header">
+        <h2 class="inline h4">IPV4 settings</h2>
+      </div>
+      <fieldset>
+        <div class="row column">
+          <label class="control-radio" for="dhcp-address">Obtain an IP address automatically using DHCP
+            <input type="radio" name="ip-address" id="dhcp-address" ng-checked="true" ng-model="interface.DHCPEnabled" ng-value="true">
+            <span class="control__indicator control__indicator-on"></span>
+          </label>
+        </div>
+        <div class="row column">
+          <label class="control-radio" for="static-ip-address">Assign a static IP address
+            <input type="radio" name="ip-address" id="static-ip-address" ng-model="interface.DHCPEnabled" ng-value="false"/>
+            <span class="control__indicator control__indicator-on"></span>
+          </label>
+        </div>
+        <fieldset class="net-config__static-ip-wrap" ng-repeat="ipv4 in interface.ipv4.values">
+          <div class="column small-12 large-4">
+            <label for="net-config__ipv4-address" class="inline">IPV4 address</label>
+            <input id="net-config__ipv4-address" type="text" ng-disabled="interface.DHCPEnabled" ng-model="ipv4.Address"/>
+          </div>
+          <div class="column small-12 large-4">
+            <label for="net-config__subnet" class="inline">Gateway</label>
+            <input id="net-config__subnet" type="text" ng-disabled="interface.DHCPEnabled" value="" ng-model="ipv4.Gateway"/>
+          </div>
+          <!-- This netmask prefix length max only works with IPV4 -->
+          <div class="column small-12 large-4">
+            <label for="net-config__default-gateway" class="inline">Netmask Prefix Length</label>
+            <input id="net-config__default-gateway" type="number" min="1" max="32" step="1" ng-disabled="interface.DHCPEnabled"  ng-model="ipv4.PrefixLength"/>
+          </div>
+        </fieldset>
+      </fieldset>
+    </section>
+    <section class="row column">
+      <div class="column small-12 page-header">
+        <h2 class="inline h4">DNS settings</h2>
+      </div>
+      <fieldset>
+        <!-- Call Nameservers "DNS Servers" on the GUI -->
+        <fieldset class="net-config__static-ip-wrap" ng-repeat="dns in interface.Nameservers track by $index">
+          <div class="column small-12">
+            <label for="net-config__prime-dns{{$index+1}}">DNS Server {{$index+1}}</label>
+            <input id="net-config__prime-dns{{$index+1}}" class="network-input column small-6 large-4 inline" type="text" ng-model="dns" ng-blur="interface.Nameservers[$index] = dns" set-focus-on-new-input//>
+            <button class="dns__server-remove inline" ng-click="removeDNSField($index)">Remove</button>
+          </div>
+        </fieldset>
+        <div class="column small-12">
+          <button type="button" class="btn-primary inline dns_add" ng-click="addDNSField()">Add new DNS server</button>
+        </div>
+      </fieldset>
+      <div class="network-config__submit-wrapper">
+        <button type="button" class="btn-primary inline" ng-click="confirm_settings=true;">Save settings</button>
+        <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
+      </div>
+      <p class="success-msg set_network_success" ng-show="set_network_success" role="alert">Success! Network settings changed!</p>
+      <p class="set_network_error error-msg" ng-show="set_network_error" role="alert">Error setting {{set_network_error}}!</p>
+    </section>
+  </form>
 </div>
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': confirm_settings}">
-	<div class="modal__tftp-unreachable" role="document">
-		<div class="screen-reader-offscreen modal-description">Change network settings</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<span class="icon icon__warning inline"><span class="accessible-text" role="alert">Warning</span></span>
-			<h1 class="modal-title h4 inline">Change network settings</h1>
-		</div>
-		<div class="modal__content">
-			<p>Changing network settings may cause the system to become unavailable (e.g. changing the BMC IP address).
-				Proceed with caution and make note of any new settings that may affect connectivity.</p>
-		</div>
-		<div class="modal__button-wrapper">
-			<button class="inline btn-secondary" ng-click="confirm_settings=false;">Cancel</button>
-			<button class="inline btn-primary" ng-click="setNetworkSettings()">Continue</button>
-		</div>
-	</div>
+  <div class="modal__tftp-unreachable" role="document">
+    <div class="screen-reader-offscreen modal-description">Change network settings</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <span class="icon icon__warning inline"><span class="accessible-text" role="alert">Warning</span></span>
+      <h1 class="modal-title h4 inline">Change network settings</h1>
+    </div>
+    <div class="modal__content">
+      <p>Changing network settings may cause the system to become unavailable (e.g. changing the BMC IP address).
+        Proceed with caution and make note of any new settings that may affect connectivity.</p>
+    </div>
+    <div class="modal__button-wrapper">
+      <button class="inline btn-secondary" ng-click="confirm_settings=false;">Cancel</button>
+      <button class="inline btn-primary" ng-click="setNetworkSettings()">Continue</button>
+    </div>
+  </div>
 </section>
diff --git a/app/configuration/controllers/snmp-controller.html b/app/configuration/controllers/snmp-controller.html
index 001aae6..e62c453 100644
--- a/app/configuration/controllers/snmp-controller.html
+++ b/app/configuration/controllers/snmp-controller.html
@@ -1,19 +1,19 @@
 <loader loading="loading"></loader>
 <div id="configuration-snmp">
-	<div class="row column">
-		<h1>SNMP settings</h1>
-	</div>
-	<form class="snmp__form" role="form" action="">
-		<section class="row column">
-			<div class="page-header">
-				<h2 class="bold h4">SNMP information</h2>
-			</div>
-			<fieldset>
-				<div class="snmp__managers" ng-repeat="manager in managers track by $index">
-					<label>SNMP Manager {{$index+1}}</label>
-					<field>{{manager.Address}}:{{manager.Port}}</field>
-				</div>
-			</fieldset>
-		</section>
-	</form>
+  <div class="row column">
+    <h1>SNMP settings</h1>
+  </div>
+  <form class="snmp__form" role="form" action="">
+    <section class="row column">
+      <div class="page-header">
+        <h2 class="bold h4">SNMP information</h2>
+      </div>
+      <fieldset>
+        <div class="snmp__managers" ng-repeat="manager in managers track by $index">
+          <label>SNMP Manager {{$index+1}}</label>
+          <field>{{manager.Address}}:{{manager.Port}}</field>
+        </div>
+      </fieldset>
+    </section>
+  </form>
 </div>
diff --git a/app/multi-server/controllers/multi-server-controller.html b/app/multi-server/controllers/multi-server-controller.html
index c477ba8..0e4d2de 100644
--- a/app/multi-server/controllers/multi-server-controller.html
+++ b/app/multi-server/controllers/multi-server-controller.html
@@ -1,226 +1,226 @@
 <loader loading="loading"></loader>
 <div id="multi-server">
-	<div class="row column">
-		<h1>All servers</h1>
-	</div>
-	<section class="row column">
-		<div class="page-header">
-			<h2 class="inline h4">All auto-discovered and manually added servers</h2>
-			<a class="inline float-right" ng-click="addServer()"><span class="icon icon__plus"></span>Add a server</a>
-		</div>
-	</section>
-	<section class="row column">
-		<!-- search -->
-		<p class="content-label" aria-label="sensors filter">Filter servers</p>
-		<div class="content__search">
-			<label for="content__search-input">Multi server search</label>
-			<input id="content__search-input" type="text" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
-			<div class="search-submit__wrapper">
-				<button class="clear-input" ng-click="clear()">&#10005;</button>
-				<input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
-			</div>
+  <div class="row column">
+    <h1>All servers</h1>
+  </div>
+  <section class="row column">
+    <div class="page-header">
+      <h2 class="inline h4">All auto-discovered and manually added servers</h2>
+      <a class="inline float-right" ng-click="addServer()"><span class="icon icon__plus"></span>Add a server</a>
+    </div>
+  </section>
+  <section class="row column">
+    <!-- search -->
+    <p class="content-label" aria-label="sensors filter">Filter servers</p>
+    <div class="content__search">
+      <label for="content__search-input">Multi server search</label>
+      <input id="content__search-input" type="text" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
+      <div class="search-submit__wrapper">
+        <button class="clear-input" ng-click="clear()">&#10005;</button>
+        <input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
+      </div>
 
-		</div>
-	</section> <!-- end search -->
+    </div>
+  </section> <!-- end search -->
 
-	<section id="" class="row column">
-		<div class="row column header-row">
-			<div class="column large-12 header__actions-bar">
-				<div class="inline multi-server__col multi-server__title">Server name<span class="sort-heading"></span></div>
-				<div class="inline multi-server__col">BMC IP address<span class="sort-heading"></span></div>
-				<div class="inline multi-server__col">Model number<span class="sort-heading sort-down"></span></div>
-				<div class="inline multi-server__col narrow-col">Power<span class="sort-heading sort-up"></span></div>
-				<div class="inline multi-server__col narrow-col">Status<span class="sort-heading"></span></div>
-			</div>
-		</div>
-		<!-- server -->
-		<div class="multi-server__col-row">
-			<div class="inline multi-server__title">IBM Power Witherspoon 2 (current)</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">BMC IP address</span>
-				<span class="multi-server__data">9.3.111.222</span>
-			</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">Model number</span>
-				<span class="multi-server__data">8335-GTC</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Power</span>
-				<span class="multi-server__data"><span class="icon icon__off" ng-class="{'icon__off': dataService.server_state == 'Off' || 'Unreachable', 'icon__good': dataService.server_state == 'Running', 'icon_standby': dataService.server_state == 'Standby'}"></span>Off</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Status</span>
-				<span class="multi-server__data"><span class="icon icon__critical" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Emergency</span>
-			</div>
-		</div>
-		<!-- server -->
-		<div class="multi-server__col-row">
-			<div class="inline multi-server__title">IBM Power Witherspoon 6</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">BMC IP address</span>
-				<span class="multi-server__data">9.3.41.232</span>
-			</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">Model number</span>
-				<span class="multi-server__data">PRT85-GTC</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Power</span>
-				<span class="multi-server__data"><span class="icon icon__good"></span>On</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Status</span>
-				<span class="multi-server__data"><span class="icon icon__good" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Good</span>
-			</div>
-		</div>
-		<!-- server -->
-		<div class="multi-server__col-row">
-			<div class="inline multi-server__title">IBM Power Witherspoon 4</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">BMC IP address</span>
-				<span class="multi-server__data">9.3.21.233</span>
-			</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">Model number</span>
-				<span class="multi-server__data">MKU-GTC</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Power</span>
-				<span class="multi-server__data"><span class="icon icon__good"></span>On</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Status</span>
-				<span class="multi-server__data"><span class="icon icon__good" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Good</span>
-			</div>
-		</div>
-		<!-- server -->
-		<div class="multi-server__col-row">
-			<div class="inline multi-server__title">Server 100023476 ligula sed magna dictum porta. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">BMC IP address</span>
-				<span class="multi-server__data">9.3.51.244</span>
-			</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">Model number</span>
-				<span class="multi-server__data">854-GTC</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Power</span>
-				<span class="multi-server__data"><span class="icon icon__good"></span>On</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Status</span>
-				<span class="multi-server__data"><span class="icon icon__critical" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Critical</span>
-			</div>
-		</div>
-		<!-- server -->
-		<div class="multi-server__col-row">
-			<div class="inline multi-server__title">Server 100023476</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">BMC IP address</span>
-				<span class="multi-server__data">9.3.185.164</span>
-			</div>
-			<div class="inline multi-server__col courier-bold">
-				<span class="multi-server__label">Model number</span>
-				<span class="multi-server__data">82225-GTC</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Power</span>
-				<span class="multi-server__data"><span class="icon icon__standby"></span>Standby</span>
-			</div>
-			<div class="inline multi-server__col narrow-col bold">
-				<span class="multi-server__label">Status</span>
-				<span class="multi-server__data"><span class="icon icon__warning" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Warning</span>
-			</div>
-		</div>
-	</section>
+  <section id="" class="row column">
+    <div class="row column header-row">
+      <div class="column large-12 header__actions-bar">
+        <div class="inline multi-server__col multi-server__title">Server name<span class="sort-heading"></span></div>
+        <div class="inline multi-server__col">BMC IP address<span class="sort-heading"></span></div>
+        <div class="inline multi-server__col">Model number<span class="sort-heading sort-down"></span></div>
+        <div class="inline multi-server__col narrow-col">Power<span class="sort-heading sort-up"></span></div>
+        <div class="inline multi-server__col narrow-col">Status<span class="sort-heading"></span></div>
+      </div>
+    </div>
+    <!-- server -->
+    <div class="multi-server__col-row">
+      <div class="inline multi-server__title">IBM Power Witherspoon 2 (current)</div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">BMC IP address</span>
+        <span class="multi-server__data">9.3.111.222</span>
+      </div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">Model number</span>
+        <span class="multi-server__data">8335-GTC</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Power</span>
+        <span class="multi-server__data"><span class="icon icon__off" ng-class="{'icon__off': dataService.server_state == 'Off' || 'Unreachable', 'icon__good': dataService.server_state == 'Running', 'icon_standby': dataService.server_state == 'Standby'}"></span>Off</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Status</span>
+        <span class="multi-server__data"><span class="icon icon__critical" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Emergency</span>
+      </div>
+    </div>
+    <!-- server -->
+    <div class="multi-server__col-row">
+      <div class="inline multi-server__title">IBM Power Witherspoon 6</div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">BMC IP address</span>
+        <span class="multi-server__data">9.3.41.232</span>
+      </div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">Model number</span>
+        <span class="multi-server__data">PRT85-GTC</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Power</span>
+        <span class="multi-server__data"><span class="icon icon__good"></span>On</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Status</span>
+        <span class="multi-server__data"><span class="icon icon__good" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Good</span>
+      </div>
+    </div>
+    <!-- server -->
+    <div class="multi-server__col-row">
+      <div class="inline multi-server__title">IBM Power Witherspoon 4</div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">BMC IP address</span>
+        <span class="multi-server__data">9.3.21.233</span>
+      </div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">Model number</span>
+        <span class="multi-server__data">MKU-GTC</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Power</span>
+        <span class="multi-server__data"><span class="icon icon__good"></span>On</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Status</span>
+        <span class="multi-server__data"><span class="icon icon__good" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Good</span>
+      </div>
+    </div>
+    <!-- server -->
+    <div class="multi-server__col-row">
+      <div class="inline multi-server__title">Server 100023476 ligula sed magna dictum porta. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem</div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">BMC IP address</span>
+        <span class="multi-server__data">9.3.51.244</span>
+      </div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">Model number</span>
+        <span class="multi-server__data">854-GTC</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Power</span>
+        <span class="multi-server__data"><span class="icon icon__good"></span>On</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Status</span>
+        <span class="multi-server__data"><span class="icon icon__critical" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Critical</span>
+      </div>
+    </div>
+    <!-- server -->
+    <div class="multi-server__col-row">
+      <div class="inline multi-server__title">Server 100023476</div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">BMC IP address</span>
+        <span class="multi-server__data">9.3.185.164</span>
+      </div>
+      <div class="inline multi-server__col courier-bold">
+        <span class="multi-server__label">Model number</span>
+        <span class="multi-server__data">82225-GTC</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Power</span>
+        <span class="multi-server__data"><span class="icon icon__standby"></span>Standby</span>
+      </div>
+      <div class="inline multi-server__col narrow-col bold">
+        <span class="multi-server__label">Status</span>
+        <span class="multi-server__data"><span class="icon icon__warning" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Warning</span>
+      </div>
+    </div>
+  </section>
 </div>
 
 <!-- add server modal -->
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': multi_server_add}">
-	<div class="modal__multi-add" role="document">
-		<div class="screen-reader-offscreen modal-description">To manually add a server that is not discovered automatically, provide either the BMC IP address or hostname and login credentials for its BMC</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 32 32"><path
-					d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
-					d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
-				Add a server
-			</h1>
-		</div>
-		<form id="multi-server_add-form" class="multi-server__add-form" action="">
-			<div class="modal__content row">
-				<div class="column large-12">
-					<label for="multi-server__host">BMC IP Address</label>
-					<input id="multi-server__host" ng-model="multi_ip" type="text" autofocus/>
-				</div>
-				<div class="column large-6">
-					<label for="username">Username</label>
-					<input type="text" id="username" name="username" ng-model="username" ng-class="{error: error}" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
-				</div>
-				<div class="column large-6">
-					<label for="password">Password</label>
-					<input type="password" id="password" name="password" class="" ng-model="password" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
-				</div>
-			</div>
-			<label class="control-check">
-				<input id="multi-server__add-view" type="checkbox" name="events__check-all" ng-model="all" />
-				<span class="control__indicator"></span>
-				<span class="inline">View this server once added</span>
-			</label>
-			<div class="modal__button-wrapper">
-				<button class="inline btn-secondary">Cancel</button>
-				<button class="inline btn-primary">Add</button>
-			</div>
-			<p class="login__error-msg" role="alert" ng-if="error">Incorrect username or password</p>
-			<p class="login__error-msg" role="alert" ng-if="server_unreachable">Server unreachable</p>
-		</form>
-	</div>
+  <div class="modal__multi-add" role="document">
+    <div class="screen-reader-offscreen modal-description">To manually add a server that is not discovered automatically, provide either the BMC IP address or hostname and login credentials for its BMC</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 32 32"><path
+          d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
+          d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
+        Add a server
+      </h1>
+    </div>
+    <form id="multi-server_add-form" class="multi-server__add-form" action="">
+      <div class="modal__content row">
+        <div class="column large-12">
+          <label for="multi-server__host">BMC IP Address</label>
+          <input id="multi-server__host" ng-model="multi_ip" type="text" autofocus/>
+        </div>
+        <div class="column large-6">
+          <label for="username">Username</label>
+          <input type="text" id="username" name="username" ng-model="username" ng-class="{error: error}" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
+        </div>
+        <div class="column large-6">
+          <label for="password">Password</label>
+          <input type="password" id="password" name="password" class="" ng-model="password" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
+        </div>
+      </div>
+      <label class="control-check">
+        <input id="multi-server__add-view" type="checkbox" name="events__check-all" ng-model="all" />
+        <span class="control__indicator"></span>
+        <span class="inline">View this server once added</span>
+      </label>
+      <div class="modal__button-wrapper">
+        <button class="inline btn-secondary">Cancel</button>
+        <button class="inline btn-primary">Add</button>
+      </div>
+      <p class="login__error-msg" role="alert" ng-if="error">Incorrect username or password</p>
+      <p class="login__error-msg" role="alert" ng-if="server_unreachable">Server unreachable</p>
+    </form>
+  </div>
 </section>
 
 <!-- login modal -->
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': multi_server_login}">
-	<div class="modal__multi-login" role="document">
-		<div class="screen-reader-offscreen modal-description">To log into the selected server, provide the login credentials for its BMC.</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 32 32"><path
-					d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
-					d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
-				Login to server
-			</h1>
-		</div>
-		<form id="multi-server_login-form" class="multi-server__login-form" action="">
-			<div class="modal__content row">
-				<div class="column large-12">
-					<!-- server -->
-					<div class="multi-server__col-row">
-						<div class="inline multi-server__title"><span class="icon icon__good" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Server 100023476</div>
-						<div class="inline multi-server__col courier-bold">
-							<span class="multi-server__data">9.3.185.164</span>
-						</div>
-						<div class="inline multi-server__col narrow-col bold">
-							<span class="multi-server__data"><span class="icon icon__standby"></span>Standby</span>
-						</div>
-					</div>
-				</div>
-				<div class="column large-6">
-					<label for="username">Username</label>
-					<input type="text" id="username" name="username" ng-model="username" ng-class="{error: error}" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
-				</div>
-				<div class="column large-6">
-					<label for="password">Password</label>
-					<input type="password" id="password" name="password" class="" ng-model="password" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
-				</div>
-			</div>
-			<div class="modal__button-wrapper">
-				<button class="inline btn-secondary">Cancel</button>
-				<button class="inline btn-primary">Login</button>
-			</div>
-			<p class="login__error-msg" role="alert" ng-if="error">Incorrect username or password</p>
-			<p class="login__error-msg" role="alert" ng-if="server_unreachable">Server unreachable</p>
-		</form>
-	</div>
+  <div class="modal__multi-login" role="document">
+    <div class="screen-reader-offscreen modal-description">To log into the selected server, provide the login credentials for its BMC.</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 32 32"><path
+          d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
+          d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
+        Login to server
+      </h1>
+    </div>
+    <form id="multi-server_login-form" class="multi-server__login-form" action="">
+      <div class="modal__content row">
+        <div class="column large-12">
+          <!-- server -->
+          <div class="multi-server__col-row">
+            <div class="inline multi-server__title"><span class="icon icon__good" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="multi.status"></span>Server 100023476</div>
+            <div class="inline multi-server__col courier-bold">
+              <span class="multi-server__data">9.3.185.164</span>
+            </div>
+            <div class="inline multi-server__col narrow-col bold">
+              <span class="multi-server__data"><span class="icon icon__standby"></span>Standby</span>
+            </div>
+          </div>
+        </div>
+        <div class="column large-6">
+          <label for="username">Username</label>
+          <input type="text" id="username" name="username" ng-model="username" ng-class="{error: error}" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
+        </div>
+        <div class="column large-6">
+          <label for="password">Password</label>
+          <input type="password" id="password" name="password" class="" ng-model="password" ng-keydown="tryLogin(username, password, $event)" ng-disabled="dataService.loading">
+        </div>
+      </div>
+      <div class="modal__button-wrapper">
+        <button class="inline btn-secondary">Cancel</button>
+        <button class="inline btn-primary">Login</button>
+      </div>
+      <p class="login__error-msg" role="alert" ng-if="error">Incorrect username or password</p>
+      <p class="login__error-msg" role="alert" ng-if="server_unreachable">Server unreachable</p>
+    </form>
+  </div>
 </section>
 
 <div class="modal-overlay" tabindex="-1" ng-class="{'active': (multi_server_add) || (multi_server_login)}"></div>
\ No newline at end of file
diff --git a/app/multi-server/controllers/multi-server-recent-controller.html b/app/multi-server/controllers/multi-server-recent-controller.html
index 70f99a2..9cd8db7 100644
--- a/app/multi-server/controllers/multi-server-recent-controller.html
+++ b/app/multi-server/controllers/multi-server-recent-controller.html
@@ -1,48 +1,48 @@
 <div class="multi-server__recent" ng-class="{'active': multi_server_recent}">
-	<a class="multi-server__add-server" ng-click="addServer()"><span class="icon icon__plus"></span>Add a server</a>
-	<a href="#/multi-server/overview" ng-click="multiRecent()" class="multi-server__view-all">View all servers (12)<i class="icon icon-angle float-right"></i></a>
-	<div class="multi-server__recent-header">Recently accessed servers</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 2 (current)</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.11.222</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
-	</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 6 Pellentesque in ipsum id orci porta dapibus</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.122.2</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
-	</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 9</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.100.111</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__off"></span>Off</div>
-	</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon alpha</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.89.122</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
-	</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 7</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.12.132</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
-	</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 19</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.100.3</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__off"></span>Off</div>
-	</div>
-	<!-- recent server-->
-	<div class="row multi-server__recent-server">
-		<button class="column large-7 multi-server__recent-name">IBM Power Witherspoon omega</button>
-		<div class="column large-3 multi-server__recent-ip">9.3.11.22</div>
-		<div class="column large-2 multi-server__recent-power"><span class="icon icon__standby"></span>Standby</div>
-	</div>
+  <a class="multi-server__add-server" ng-click="addServer()"><span class="icon icon__plus"></span>Add a server</a>
+  <a href="#/multi-server/overview" ng-click="multiRecent()" class="multi-server__view-all">View all servers (12)<i class="icon icon-angle float-right"></i></a>
+  <div class="multi-server__recent-header">Recently accessed servers</div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 2 (current)</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.11.222</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
+  </div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 6 Pellentesque in ipsum id orci porta dapibus</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.122.2</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
+  </div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 9</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.100.111</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__off"></span>Off</div>
+  </div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon alpha</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.89.122</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
+  </div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 7</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.12.132</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__good"></span>On</div>
+  </div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon 19</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.100.3</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__off"></span>Off</div>
+  </div>
+  <!-- recent server-->
+  <div class="row multi-server__recent-server">
+    <button class="column large-7 multi-server__recent-name">IBM Power Witherspoon omega</button>
+    <div class="column large-3 multi-server__recent-ip">9.3.11.22</div>
+    <div class="column large-2 multi-server__recent-power"><span class="icon icon__standby"></span>Standby</div>
+  </div>
 </div>
 <div class="modal-overlay" tabindex="-1" ng-class="{'active': (multi_server_recent)}"></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 a6a4563..a99775c 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -1,182 +1,182 @@
 <loader loading="loading"></loader>
 <div class="overview">
-	<div class="row column">
-		<h1 class="inline">{{dataService.hostname}}</h1>
-		<button class="link" ng-click="edit_hostname = !edit_hostname">edit</button><!-- this is default name. Will show custom server name if set -->
-	</div>
-	<section class="row">
-		<div class="column large-8">
-			<!-- Server Metadata -->
-			<div class="row overview__server-metadata">
-				<div class="column large-4">
-					<h3 class="bold h4">Server information</h3>
-				</div>
-				<div class="column large-8">
-					<ul class="overview__metadata-wrapper">
-						<li class="overview__metadata-block">
-							<p class="content-label">Model</p>
-							<p class="courier-bold">{{server_info.Model}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">Manufacturer</p>
-							<p class="courier-bold">{{server_info.Manufacturer}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">Firmware version</p>
-							<p class="courier-bold">{{server_firmware}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">Serial number</p>
-							<p class="courier-bold">{{server_info.SerialNumber}}</p>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<!-- BMC Metadata -->
-			<div class="row overview__server-metadata">
-				<div class="column large-4">
-					<h3 class="bold h4">BMC information</h3>
-				</div>
-				<div class="column large-8">
-					<ul class="overview__metadata-wrapper">
-						<li class="overview__metadata-block">
-							<p class="content-label">Hostname</p>
-							<p class="courier-bold overview__hostname">{{dataService.hostname}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">IP addresses</p>
-							<p class="courier-bold" ng-repeat="ip_address in bmc_ip_addresses">{{ip_address}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">Firmware Version</p>
-							<p class="courier-bold">{{bmc_firmware}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">Mac address</p>
-							<p class="courier-bold">{{dataService.mac_address}}</p>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<!-- Power metadata -->
-			<div class="row overview__server-metadata">
-				<div class="column large-4">
-					<h3 class="bold h4">Power information</h3>
-				</div>
-				<div class="column large-8">
-					<ul class="overview__metadata-wrapper">
-						<li class="overview__metadata-block">
-							<p class="content-label">Power Consumption</p>
-							<p class="courier-bold">{{power_consumption}}</p>
-						</li>
-						<li class="overview__metadata-block">
-							<p class="content-label">Power Cap</p>
-							<p class="courier-bold">{{power_cap}}</p>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<!-- Power metadata -->
-		</div>
-		<div class="column large-4 no-padding">
-			<div class="quick-links">
-				<a href="#/server-health/event-log/high" class="quick-links__item quick-links__events event-log__events" ng-show="logs.length">
-					<p class="inline quick-links__event-copy">View {{logs.length}} high priority events</p><!-- link to event log filtered to the high priority events -->
-				</a>
-				<div class="quick-links__item no-icon">
-					<p class="inline quick-links__label">BMC time</p>
-					<p class="inline courier-bold float-right">{{bmc_time | date:'medium'}}</p>
-				</div>
-				<div class="quick-links__item no-icon">
-					<p class="inline quick-links__label">Turn <span ng-if="dataService.LED_state == 'off'">on</span><span ng-if="dataService.LED_state == 'on'">off</span> server LED</p>
-					<div class="toggle inline float-right">
-						<input id="toggle__switch-round"
-								class="toggle-switch toggle-switch__round-flat"
-								type="checkbox"
-								tabindex="0"
-								ng-click="toggleLED()"
-								ng-checked="dataService.LED_state == 'on'"
-								ng-disabled="dataService.server_unreachable">
-						<label for="toggle__switch-round" tabindex="0">Server LED is <span class="led-switch__status">{{dataService.LED_state}}</span></label>
-					</div>
-				</div>
-				<a href="#/server-control/remote-console" class="no-icon quick-links__item">
-					<p class="inline quick-links__label">Serial over LAN console</p>
-					<span class="btn-pop-out inline float-right"></span>
-				</a>
-				<a href="#/configuration/network" class="quick-links__item">
-					<p class="inline quick-links__label">Edit network settings</p>
-				</a>
-			</div>
-		</div>
-	</section>
-	<section class="row">
-		<div class="column large-12 overview__event-log event-log__events" ng-show="logs.length">
-			<div class="page-header">
-				<h3 class="bold h4 inline">High priority events ({{logs.length}})</h3>
-				<a href="#/server-health/event-log/" class="inline float-right">View all event logs</a>
-			</div>
+  <div class="row column">
+    <h1 class="inline">{{dataService.hostname}}</h1>
+    <button class="link" ng-click="edit_hostname = !edit_hostname">edit</button><!-- this is default name. Will show custom server name if set -->
+  </div>
+  <section class="row">
+    <div class="column large-8">
+      <!-- Server Metadata -->
+      <div class="row overview__server-metadata">
+        <div class="column large-4">
+          <h3 class="bold h4">Server information</h3>
+        </div>
+        <div class="column large-8">
+          <ul class="overview__metadata-wrapper">
+            <li class="overview__metadata-block">
+              <p class="content-label">Model</p>
+              <p class="courier-bold">{{server_info.Model}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">Manufacturer</p>
+              <p class="courier-bold">{{server_info.Manufacturer}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">Firmware version</p>
+              <p class="courier-bold">{{server_firmware}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">Serial number</p>
+              <p class="courier-bold">{{server_info.SerialNumber}}</p>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <!-- BMC Metadata -->
+      <div class="row overview__server-metadata">
+        <div class="column large-4">
+          <h3 class="bold h4">BMC information</h3>
+        </div>
+        <div class="column large-8">
+          <ul class="overview__metadata-wrapper">
+            <li class="overview__metadata-block">
+              <p class="content-label">Hostname</p>
+              <p class="courier-bold overview__hostname">{{dataService.hostname}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">IP addresses</p>
+              <p class="courier-bold" ng-repeat="ip_address in bmc_ip_addresses">{{ip_address}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">Firmware Version</p>
+              <p class="courier-bold">{{bmc_firmware}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">Mac address</p>
+              <p class="courier-bold">{{dataService.mac_address}}</p>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <!-- Power metadata -->
+      <div class="row overview__server-metadata">
+        <div class="column large-4">
+          <h3 class="bold h4">Power information</h3>
+        </div>
+        <div class="column large-8">
+          <ul class="overview__metadata-wrapper">
+            <li class="overview__metadata-block">
+              <p class="content-label">Power Consumption</p>
+              <p class="courier-bold">{{power_consumption}}</p>
+            </li>
+            <li class="overview__metadata-block">
+              <p class="content-label">Power Cap</p>
+              <p class="courier-bold">{{power_cap}}</p>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <!-- Power metadata -->
+    </div>
+    <div class="column large-4 no-padding">
+      <div class="quick-links">
+        <a href="#/server-health/event-log/high" class="quick-links__item quick-links__events event-log__events" ng-show="logs.length">
+          <p class="inline quick-links__event-copy">View {{logs.length}} high priority events</p><!-- link to event log filtered to the high priority events -->
+        </a>
+        <div class="quick-links__item no-icon">
+          <p class="inline quick-links__label">BMC time</p>
+          <p class="inline courier-bold float-right">{{bmc_time | date:'medium'}}</p>
+        </div>
+        <div class="quick-links__item no-icon">
+          <p class="inline quick-links__label">Turn <span ng-if="dataService.LED_state == 'off'">on</span><span ng-if="dataService.LED_state == 'on'">off</span> server LED</p>
+          <div class="toggle inline float-right">
+            <input id="toggle__switch-round"
+                class="toggle-switch toggle-switch__round-flat"
+                type="checkbox"
+                tabindex="0"
+                ng-click="toggleLED()"
+                ng-checked="dataService.LED_state == 'on'"
+                ng-disabled="dataService.server_unreachable">
+            <label for="toggle__switch-round" tabindex="0">Server LED is <span class="led-switch__status">{{dataService.LED_state}}</span></label>
+          </div>
+        </div>
+        <a href="#/server-control/remote-console" class="no-icon quick-links__item">
+          <p class="inline quick-links__label">Serial over LAN console</p>
+          <span class="btn-pop-out inline float-right"></span>
+        </a>
+        <a href="#/configuration/network" class="quick-links__item">
+          <p class="inline quick-links__label">Edit network settings</p>
+        </a>
+      </div>
+    </div>
+  </section>
+  <section class="row">
+    <div class="column large-12 overview__event-log event-log__events" ng-show="logs.length">
+      <div class="page-header">
+        <h3 class="bold h4 inline">High priority events ({{logs.length}})</h3>
+        <a href="#/server-health/event-log/" class="inline float-right">View all event logs</a>
+      </div>
 
-			<!-- single event -->
-			<a href="#/server-health/event-log/high" ng-repeat="event in logs|orderBy:'-Id'|limitTo : 5">
-				<div class="row column event-log__single-event">
-					<div class="row">
-						<div class="column small-1 large-1 event-log__col-check">
-							<label class="control-check">
-								<input type="checkbox" name="events__check" ng-click="event.selected= ! event.selected"
-										ng-checked="event.selected"/>
-								<span class="control__indicator"></span>
-							</label>
-						</div>
-						<div class="column small-9 large-10 event-log__event-info" ng-click=""><!-- click will go to specific event in event log page-->
-							<p class="inline event__id">#{{event.Id}}</p>
-							<p class="inline event__priority high-priority">High</p>
-							<p class="inline event__severity high-priority">{{event.severity_code}}</p>
-							<p class="inline event__timestamp">{{event.Timestamp| date:'MM/dd/yyyy  HH:mm:ss '+tmz: tmz}}</p>
-							<div>
-								<p class="inline event__description">{{getEventLogTitle(event)}}</p>
-							</div>
-						</div>
-						<div class="column small-1 large-1">
-							<button class="accord-trigger" aria-hidden="true"></button>
-						</div>
-					</div>
-				</div>
-			</a>
-		</div>
+      <!-- single event -->
+      <a href="#/server-health/event-log/high" ng-repeat="event in logs|orderBy:'-Id'|limitTo : 5">
+        <div class="row column event-log__single-event">
+          <div class="row">
+            <div class="column small-1 large-1 event-log__col-check">
+              <label class="control-check">
+                <input type="checkbox" name="events__check" ng-click="event.selected= ! event.selected"
+                    ng-checked="event.selected"/>
+                <span class="control__indicator"></span>
+              </label>
+            </div>
+            <div class="column small-9 large-10 event-log__event-info" ng-click=""><!-- click will go to specific event in event log page-->
+              <p class="inline event__id">#{{event.Id}}</p>
+              <p class="inline event__priority high-priority">High</p>
+              <p class="inline event__severity high-priority">{{event.severity_code}}</p>
+              <p class="inline event__timestamp">{{event.Timestamp| date:'MM/dd/yyyy  HH:mm:ss '+tmz: tmz}}</p>
+              <div>
+                <p class="inline event__description">{{getEventLogTitle(event)}}</p>
+              </div>
+            </div>
+            <div class="column small-1 large-1">
+              <button class="accord-trigger" aria-hidden="true"></button>
+            </div>
+          </div>
+        </div>
+      </a>
+    </div>
 
-		<div class="row column overview__event-log event-log__events" ng-show="!logs.length">
-			<div class="page-header">
-				<h3 class="bold h4">High priority events (0)</h3>
-			</div>
-			<p>There are no high priority events to display at this time.</p>
-		</div>
-	</section>
+    <div class="row column overview__event-log event-log__events" ng-show="!logs.length">
+      <div class="page-header">
+        <h3 class="bold h4">High priority events (0)</h3>
+      </div>
+      <p>There are no high priority events to display at this time.</p>
+    </div>
+  </section>
 </div>
 <!-- edit server name modal -->
 <section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': edit_hostname}">
-	<div class="modal__upload" role="document">
-		<div class="screen-reader-offscreen modal-description">Edit hostname</div><!-- accessibility only; used for screen readers -->
-		<div class="page-header ">
-			<h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 32 32"><path
-					d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
-					d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
-				Edit hostname
-			</h1>
-		</div>
-		<div class="modal__content">
-			<p>The hostname is displayed in the header and can contain any characters up to a total of 64</p>
-			<form>
-				<label for="editServerName" class="hide"></label>
-				<input id="editServerName" class="modal__edit-server-name" maxlength="64" type="text" ng-model="char_count" ng-trim="false">
-				<p class="modal__char-count">{{64 - char_count.length}}/64</p>
-			</form>
-		</div>
-		<div class="modal__button-wrapper">
-			<button class="inline btn-secondary" ng-click="edit_hostname= false;">Cancel</button>
-			<button class="inline btn-primary" ng-click="saveHostname(char_count);">Save</button>
-		</div>
-	</div>
+  <div class="modal__upload" role="document">
+    <div class="screen-reader-offscreen modal-description">Edit hostname</div><!-- accessibility only; used for screen readers -->
+    <div class="page-header ">
+      <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 32 32"><path
+          d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
+          d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
+        Edit hostname
+      </h1>
+    </div>
+    <div class="modal__content">
+      <p>The hostname is displayed in the header and can contain any characters up to a total of 64</p>
+      <form>
+        <label for="editServerName" class="hide"></label>
+        <input id="editServerName" class="modal__edit-server-name" maxlength="64" type="text" ng-model="char_count" ng-trim="false">
+        <p class="modal__char-count">{{64 - char_count.length}}/64</p>
+      </form>
+    </div>
+    <div class="modal__button-wrapper">
+      <button class="inline btn-secondary" ng-click="edit_hostname= false;">Cancel</button>
+      <button class="inline btn-primary" ng-click="saveHostname(char_count);">Save</button>
+    </div>
+  </div>
 </section>
 <div class="modal-overlay" tabindex="-1" ng-class="{'active': edit_hostname}"></div>
diff --git a/app/redfish/controllers/redfish-controller.html b/app/redfish/controllers/redfish-controller.html
index eff1f8a..9446c92 100644
--- a/app/redfish/controllers/redfish-controller.html
+++ b/app/redfish/controllers/redfish-controller.html
@@ -1,42 +1,42 @@
 <loader loading="loading"></loader>
 <div id="redfish">
-	<div class="row column">
-		<div style="max-width: 400px;margin:0">
-			<img src="../../assets/images/DMTF_Redfish_logo_2017.svg">
-		</div>
-	</div>
-	<div class="row column">
-		{
-		<ul style="list-style: none;">
-			<li ng-repeat="(key, value) in redfishData" ng-include="'recurse'"> </li>
-		</ul>
-		}
-	</div>
+  <div class="row column">
+    <div style="max-width: 400px;margin:0">
+      <img src="../../assets/images/DMTF_Redfish_logo_2017.svg">
+    </div>
+  </div>
+  <div class="row column">
+    {
+    <ul style="list-style: none;">
+      <li ng-repeat="(key, value) in redfishData" ng-include="'recurse'"> </li>
+    </ul>
+    }
+  </div>
 </div>
 <script type="text/ng-template" id="recurse">
 "<b>{{key}}</b>":
 <span ng-if="isObject(value) && !isArray(value)">
 {
-	<ul style="list-style: none;">
-		<li ng-repeat="(key, value) in value" ng-include="'recurse'"> </li>
-	</ul>
+  <ul style="list-style: none;">
+    <li ng-repeat="(key, value) in value" ng-include="'recurse'"> </li>
+  </ul>
 },</br>
 </span>
 
 <span ng-if="isArray(value)">
 [
-	<div ng-repeat="val in value" style="margin-left: 2em;">
-		<span ng-if="isObject(val) && !isArray(val)">
-			{
-			<ul style="list-style: none;">
-				<li ng-repeat="(key, value) in val" ng-include="'recurse'"> </li>
-			</ul>
-			},</br>
-		</span>
-		<span ng-if="!isObject(val) && !isArray(val)">
-		{{val}}
-		</span>
-	</div>
+  <div ng-repeat="val in value" style="margin-left: 2em;">
+    <span ng-if="isObject(val) && !isArray(val)">
+      {
+      <ul style="list-style: none;">
+        <li ng-repeat="(key, value) in val" ng-include="'recurse'"> </li>
+      </ul>
+      },</br>
+    </span>
+    <span ng-if="!isObject(val) && !isArray(val)">
+    {{val}}
+    </span>
+  </div>
 ]
 </span>
 
diff --git a/app/server-control/controllers/bmc-reboot-controller.html b/app/server-control/controllers/bmc-reboot-controller.html
index afadc1f..8b987a3 100644
--- a/app/server-control/controllers/bmc-reboot-controller.html
+++ b/app/server-control/controllers/bmc-reboot-controller.html
@@ -1,26 +1,26 @@
 <section id="bmc-reboot">
-	<div class="row column">
-		<h1>Reboot BMC</h1>
-	</div>
-	<div class="row column">
-		<div class="page-header">
-			<p class="inline h4">Current BMC boot status</p>
-			<div class="float-right bmc-reboot__status-log inline">BMC last reboot at
-				<span class="courier-bold">{{reboot_time | date:'medium'}}</span></div>
-		</div>
-	</div>
-	<div class="row column">
-		<div class="bmc-reboot-option" ng-class="{disabled: dataService.server_unreachable || dataService.loading, transitionAll: confirm}">
-			<p>When you reboot the BMC, your web browser loses contact with the BMC for several minutes. When the BMC is back online, you must log in again. If the Log In button is not available when the BMC is brought back online, close your web browser. Then, reopen the web browser and enter your BMC IP address.</p>
-			<confirm title="Reboot the BMC"
-					confirm="confirm"
-					ng-show="confirm"
-					callback="reboot"></confirm>
-		</div>
-	</div>
-	<div class="row column">
-		<button id="bmc__reboot" class="btn-secondary float-right" ng-class="{disabled: confirm}" ng-click="rebootConfirm()" ng-disabled="dataService.server_unreachable">
-			<i>&#x21BB</i> Reboot BMC
-		</button>
-	</div>
+  <div class="row column">
+    <h1>Reboot BMC</h1>
+  </div>
+  <div class="row column">
+    <div class="page-header">
+      <p class="inline h4">Current BMC boot status</p>
+      <div class="float-right bmc-reboot__status-log inline">BMC last reboot at
+        <span class="courier-bold">{{reboot_time | date:'medium'}}</span></div>
+    </div>
+  </div>
+  <div class="row column">
+    <div class="bmc-reboot-option" ng-class="{disabled: dataService.server_unreachable || dataService.loading, transitionAll: confirm}">
+      <p>When you reboot the BMC, your web browser loses contact with the BMC for several minutes. When the BMC is back online, you must log in again. If the Log In button is not available when the BMC is brought back online, close your web browser. Then, reopen the web browser and enter your BMC IP address.</p>
+      <confirm title="Reboot the BMC"
+          confirm="confirm"
+          ng-show="confirm"
+          callback="reboot"></confirm>
+    </div>
+  </div>
+  <div class="row column">
+    <button id="bmc__reboot" class="btn-secondary float-right" ng-class="{disabled: confirm}" ng-click="rebootConfirm()" ng-disabled="dataService.server_unreachable">
+      <i>&#x21BB</i> Reboot BMC
+    </button>
+  </div>
 </section>
diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html
index 793f5e9..0a89e6f 100644
--- a/app/server-control/controllers/power-usage-controller.html
+++ b/app/server-control/controllers/power-usage-controller.html
@@ -1,47 +1,47 @@
 <loader loading="loading"></loader>
 <div id="power-usage">
-	<div class="row column">
-		<h1>Manage Power Usage</h1>
-	</div>
-	<form class="power-usage__form" role="form" action="">
-		<section class="row column">
-			<div class="page-header">
-				<h2 class="bold h4">Power information</h2>
-			</div>
-			<fieldset>
-					<ul class="power-usage__metadata-wrapper">
-						<li class="power-usage__metadata-block">
-							<p class="content-label">Power Consumption</p>
-							<p class="courier-bold">{{power_consumption}}</p>
-						</li>
-						<li class="power-usage__metadata-block">
-							<div class="toggle inline">
-								<input id="toggle__switch-round"
-												class="toggle-switch toggle-switch__round-flat"
-												type="checkbox"
-												tabindex="0"
-												ng-model="power_cap.PowerCapEnable"
-												ng-checked="power_cap.PowerCapEnable">
-								<label for="toggle__switch-round" tabindex="0">Server power cap setting is <span class="uid-switch__status">{{power_cap.PowerCapEnable ? "on" : "off"}}</span></label>
-							</div>
-							<div class="power-usage__switch-label inline">
-								<p>Server power cap setting is <span class="uid-switch__status">{{power_cap.PowerCapEnable ? "on" : "off"}}</span></p>
-								<p>Set a power cap to keep power consumption at or below the specified value in watts.</p>
-							</div>
-							<div class="small-12 large-4">
-								<p class="content-label power-cap-value-label">POWER CAP VALUE IN WATTS</p>
-								<input id="power-cap" type="number" min="100" max="10000" step="1" ng-disabled="!power_cap.PowerCapEnable"  ng-model="power_cap.PowerCap"/>
-							</div>
-						</li>
-					</ul>
-			</fieldset>
-			<div class="power-usage__submit-wrapper">
-				<button type="button" class="btn-primary inline" ng-click="setPowerCap()">Save settings</button>
-				<button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
-			</div>
-			<p class="success-msg" ng-show="set_power_cap_success" role="alert">Success! Power cap changed!</p>
-			<p class="set_powercap_error error-msg" ng-show="set_power_cap_error" role="alert">Error setting Power Cap!</p>
-		</section>
-	</form>
+  <div class="row column">
+    <h1>Manage Power Usage</h1>
+  </div>
+  <form class="power-usage__form" role="form" action="">
+    <section class="row column">
+      <div class="page-header">
+        <h2 class="bold h4">Power information</h2>
+      </div>
+      <fieldset>
+          <ul class="power-usage__metadata-wrapper">
+            <li class="power-usage__metadata-block">
+              <p class="content-label">Power Consumption</p>
+              <p class="courier-bold">{{power_consumption}}</p>
+            </li>
+            <li class="power-usage__metadata-block">
+              <div class="toggle inline">
+                <input id="toggle__switch-round"
+                        class="toggle-switch toggle-switch__round-flat"
+                        type="checkbox"
+                        tabindex="0"
+                        ng-model="power_cap.PowerCapEnable"
+                        ng-checked="power_cap.PowerCapEnable">
+                <label for="toggle__switch-round" tabindex="0">Server power cap setting is <span class="uid-switch__status">{{power_cap.PowerCapEnable ? "on" : "off"}}</span></label>
+              </div>
+              <div class="power-usage__switch-label inline">
+                <p>Server power cap setting is <span class="uid-switch__status">{{power_cap.PowerCapEnable ? "on" : "off"}}</span></p>
+                <p>Set a power cap to keep power consumption at or below the specified value in watts.</p>
+              </div>
+              <div class="small-12 large-4">
+                <p class="content-label power-cap-value-label">POWER CAP VALUE IN WATTS</p>
+                <input id="power-cap" type="number" min="100" max="10000" step="1" ng-disabled="!power_cap.PowerCapEnable"  ng-model="power_cap.PowerCap"/>
+              </div>
+            </li>
+          </ul>
+      </fieldset>
+      <div class="power-usage__submit-wrapper">
+        <button type="button" class="btn-primary inline" ng-click="setPowerCap()">Save settings</button>
+        <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
+      </div>
+      <p class="success-msg" ng-show="set_power_cap_success" role="alert">Success! Power cap changed!</p>
+      <p class="set_powercap_error error-msg" ng-show="set_power_cap_error" role="alert">Error setting Power Cap!</p>
+    </section>
+  </form>
 </div>
 
diff --git a/app/server-control/controllers/remote-console-controller.html b/app/server-control/controllers/remote-console-controller.html
index 3011eb0..4d1887a 100644
--- a/app/server-control/controllers/remote-console-controller.html
+++ b/app/server-control/controllers/remote-console-controller.html
@@ -1,19 +1,19 @@
 <div id="server-control-remote-console">
-	<div class="row column">
-		<h1>Serial over LAN console</h1>
-	</div>
-	<section class="row column">
-		<div class="page-header">
-			<h2 class="h4">Access the Serial over LAN console</h2>
-		</div>
-	</section>
-	<section class="row column">
-		<p class="serial-lan__copy">The Serial over LAN (SoL) console redirects the output of the server’s serial port to a browser window on your workstation.</p>
-	</section>
-	<section class="row column">
-		<div class="terminal-container">
-			<serial-console show-tab-btn="true"></serial-console>
-		</div>
-	</section>
+  <div class="row column">
+    <h1>Serial over LAN console</h1>
+  </div>
+  <section class="row column">
+    <div class="page-header">
+      <h2 class="h4">Access the Serial over LAN console</h2>
+    </div>
+  </section>
+  <section class="row column">
+    <p class="serial-lan__copy">The Serial over LAN (SoL) console redirects the output of the server’s serial port to a browser window on your workstation.</p>
+  </section>
+  <section class="row column">
+    <div class="terminal-container">
+      <serial-console show-tab-btn="true"></serial-console>
+    </div>
+  </section>
 </div>
 
diff --git a/app/server-control/controllers/remote-console-window-controller.html b/app/server-control/controllers/remote-console-window-controller.html
index bde520d..7c39e22 100644
--- a/app/server-control/controllers/remote-console-window-controller.html
+++ b/app/server-control/controllers/remote-console-window-controller.html
@@ -1,7 +1,7 @@
 <div class="serial-lan__header">
-	<a class="bold" ng-click="close()"><i class="icon icon__return"></i> Return to OpenBmc</a>
+  <a class="bold" ng-click="close()"><i class="icon icon__return"></i> Return to OpenBmc</a>
 </div>
 <div class="window-terminal-container">
-	<serial-console show-tab-btn="false"></serial-console>
+  <serial-console show-tab-btn="false"></serial-console>
 </div>
 
diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html
index 29f2c37..b9f6f27 100644
--- a/app/server-health/controllers/inventory-overview-controller.html
+++ b/app/server-health/controllers/inventory-overview-controller.html
@@ -1,57 +1,57 @@
 <loader loading="loading"></loader>
 <div class="inventory-overview">
-	<div class="row column no-padding">
-		<h1>Hardware status</h1>
-		<div class="page-header">
-			<h2 class="inline h4">All hardware in the system</h2>
-			<a ng-href="data:text/json;charset=utf-8,{{originalData}}" class="inline btn-export float-right"  download="export_inventory.json" ng-show="hardwares.length">Export</a>
+  <div class="row column no-padding">
+    <h1>Hardware status</h1>
+    <div class="page-header">
+      <h2 class="inline h4">All hardware in the system</h2>
+      <a ng-href="data:text/json;charset=utf-8,{{originalData}}" class="inline btn-export float-right"  download="export_inventory.json" ng-show="hardwares.length">Export</a>
 
-		</div>
-	</div>
-	<section class="row column">
-		<!-- search -->
-		<p class="content-label" aria-label="hardware filter">Filter hardware components</p>
-		<div class="content__search">
-			<label for="content__search-input">Search</label> <input id="content__search-input" type="text"
-				ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
-			<div class="search-submit__wrapper">
-				<button class="clear-input" ng-click="clear()">&#10005;</button>
-				<input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
-			</div>
+    </div>
+  </div>
+  <section class="row column">
+    <!-- search -->
+    <p class="content-label" aria-label="hardware filter">Filter hardware components</p>
+    <div class="content__search">
+      <label for="content__search-input">Search</label> <input id="content__search-input" type="text"
+        ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
+      <div class="search-submit__wrapper">
+        <button class="clear-input" ng-click="clear()">&#10005;</button>
+        <input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
+      </div>
 
-		</div>
+    </div>
 
-	</section>
-	<!-- end search -->
-	<section id="inventory-categories" class="row column">
-		<div class="row column header-row">
-			<div class="column large-12 header__actions-bar">
-				<div class="inline inventory__heading inventory__device-col">Hardware</div>
-				<div class="inline inventory__heading inventory__function-col">&nbsp;</div>
-				<div class="inline inventory__heading inventory__assoc-event"><!--Associated events--></div>
-			</div>
-		</div>
-		<div ng-repeat="inventory in hardwares|filter:filterBySearchTerms" class="inventory__group"  ng-class="{'active': inventory.expanded}" ng-click="inventory.expanded = ! inventory.expanded">
-			<p class="inline inventory__device-col">{{inventory.title}}</p>
-			<p class="inline inventory__function-col"></p>
-			<p class="inline inventory__assoc-event"><!--<a href="#/server-health/event-log">View 3 events</a>--></p>
-			<button class="accord-trigger float-right" ng-class="{'active': inventory.expanded}"></button>
-			<div class="row inventory__metadata" ng-class="{'active': inventory.expanded}" ng-click="$event.stopPropagation()">
-				<div class="column large-9 no-padding">
-					<div  ng-repeat="item in inventory.items" class="inline inventory__metadata-block">
-						<p class="content-label">{{item.key}}</p>
-						<p class="courier-bold">{{item.value}}</p>
-					</div>
-				</div>
-				<div class="column large-3 no-padding" ng-show="inventory.sub_components.length">
-					<div class="inventory__metadata-scroll show-scroll"> <!-- If content overflows; add 'show-scroll' class via JS to force visible scrollbar in webkit browsers-->
-						<div class="content-label">Subcomponents</div>
-						<div ng-repeat="sub_component in inventory.sub_components" class="inline inventory__metadata-block" ng-if="sub_component.Present">
-							<p class="courier-bold">{{sub_component.title}}<span class="icon icon__warning" ng-if="!sub_component.Functional"></span></p>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</section>
+  </section>
+  <!-- end search -->
+  <section id="inventory-categories" class="row column">
+    <div class="row column header-row">
+      <div class="column large-12 header__actions-bar">
+        <div class="inline inventory__heading inventory__device-col">Hardware</div>
+        <div class="inline inventory__heading inventory__function-col">&nbsp;</div>
+        <div class="inline inventory__heading inventory__assoc-event"><!--Associated events--></div>
+      </div>
+    </div>
+    <div ng-repeat="inventory in hardwares|filter:filterBySearchTerms" class="inventory__group"  ng-class="{'active': inventory.expanded}" ng-click="inventory.expanded = ! inventory.expanded">
+      <p class="inline inventory__device-col">{{inventory.title}}</p>
+      <p class="inline inventory__function-col"></p>
+      <p class="inline inventory__assoc-event"><!--<a href="#/server-health/event-log">View 3 events</a>--></p>
+      <button class="accord-trigger float-right" ng-class="{'active': inventory.expanded}"></button>
+      <div class="row inventory__metadata" ng-class="{'active': inventory.expanded}" ng-click="$event.stopPropagation()">
+        <div class="column large-9 no-padding">
+          <div  ng-repeat="item in inventory.items" class="inline inventory__metadata-block">
+            <p class="content-label">{{item.key}}</p>
+            <p class="courier-bold">{{item.value}}</p>
+          </div>
+        </div>
+        <div class="column large-3 no-padding" ng-show="inventory.sub_components.length">
+          <div class="inventory__metadata-scroll show-scroll"> <!-- If content overflows; add 'show-scroll' class via JS to force visible scrollbar in webkit browsers-->
+            <div class="content-label">Subcomponents</div>
+            <div ng-repeat="sub_component in inventory.sub_components" class="inline inventory__metadata-block" ng-if="sub_component.Present">
+              <p class="courier-bold">{{sub_component.title}}<span class="icon icon__warning" ng-if="!sub_component.Functional"></span></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
 </div>
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index 8137b84..17030ba 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -1,72 +1,72 @@
 <loader loading="loading"></loader>
 <div id="sensors-overview">
-	<div class="row column">
-		<h1>Sensors</h1>
-	</div>
-	<section class="row column">
-		<div class="page-header">
-			<h2 class="inline h4">All sensors present in the system</h2>
-			<a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export float-right" download="{{export_name}}">Export</a>
-		</div>
-	</section>
-	<section class="row column">
-		<!-- search -->
-		<p class="content-label" aria-label="sensors filter">Filter sensors</p>
-		<div class="content__search">
-			<label for="content__search-input">Sensors Search</label>
-			<input id="content__search-input" type="text" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
-			<div class="search-submit__wrapper">
-				<button class="clear-input" ng-click="clear()">&#10005;</button>
-				<input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
-			</div>
+  <div class="row column">
+    <h1>Sensors</h1>
+  </div>
+  <section class="row column">
+    <div class="page-header">
+      <h2 class="inline h4">All sensors present in the system</h2>
+      <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export float-right" download="{{export_name}}">Export</a>
+    </div>
+  </section>
+  <section class="row column">
+    <!-- search -->
+    <p class="content-label" aria-label="sensors filter">Filter sensors</p>
+    <div class="content__search">
+      <label for="content__search-input">Sensors Search</label>
+      <input id="content__search-input" type="text" ng-model="customSearch" ng-keydown="doSearchOnEnter($event)"/>
+      <div class="search-submit__wrapper">
+        <button class="clear-input" ng-click="clear()">&#10005;</button>
+        <input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
+      </div>
 
-		</div>
-		<div class="toggle-filter">
-			<p class="content-label">FILTER BY SEVERITY</p>
-			<button class="inline first btn-primary" ng-click="toggleSeverityAll()"
-					ng-class="selectedSeverity.all ? 'btn-primary' : 'btn-secondary'">All
-			</button>
-			<button class="inline " ng-click="toggleSeverity('critical')"
-					ng-class="selectedSeverity.critical ? 'btn-primary' : 'btn-secondary'">Critical
-			</button>
-			<button class="inline" ng-click="toggleSeverity('warning')"
-					ng-class="selectedSeverity.warning ? 'btn-primary' : 'btn-secondary'">Warning
-			</button>
-			<button class="inline" ng-click="toggleSeverity('normal')"
-					ng-class="selectedSeverity.normal ? 'btn-primary' : 'btn-secondary'">Normal
-			</button>
-		</div>
+    </div>
+    <div class="toggle-filter">
+      <p class="content-label">FILTER BY SEVERITY</p>
+      <button class="inline first btn-primary" ng-click="toggleSeverityAll()"
+          ng-class="selectedSeverity.all ? 'btn-primary' : 'btn-secondary'">All
+      </button>
+      <button class="inline " ng-click="toggleSeverity('critical')"
+          ng-class="selectedSeverity.critical ? 'btn-primary' : 'btn-secondary'">Critical
+      </button>
+      <button class="inline" ng-click="toggleSeverity('warning')"
+          ng-class="selectedSeverity.warning ? 'btn-primary' : 'btn-secondary'">Warning
+      </button>
+      <button class="inline" ng-click="toggleSeverity('normal')"
+          ng-class="selectedSeverity.normal ? 'btn-primary' : 'btn-secondary'">Normal
+      </button>
+    </div>
 
-	</section> <!-- end search -->
+  </section> <!-- end search -->
 
-	<section class="row column" ng-show="filteredSensorData.length == 0">
-		<!-- message -->
-		<span ng-if="selectedSeverity.all">{{messages.NO_SENSOR_DATA}}</span>
-		<span ng-if="selectedSeverity.critical">{{messages.CRITICAL_NO_SENSOR_DATA}}</span>
-		<span ng-if="selectedSeverity.warning">{{messages.WARNING_NO_SENSOR_DATA}}</span>
-		<span ng-if="selectedSeverity.normal">{{messages.NORMAL_NO_SENSOR_DATA}}</span>
-		<!-- end message -->
-	</section>
+  <section class="row column" ng-show="filteredSensorData.length == 0">
+    <!-- message -->
+    <span ng-if="selectedSeverity.all">{{messages.NO_SENSOR_DATA}}</span>
+    <span ng-if="selectedSeverity.critical">{{messages.CRITICAL_NO_SENSOR_DATA}}</span>
+    <span ng-if="selectedSeverity.warning">{{messages.WARNING_NO_SENSOR_DATA}}</span>
+    <span ng-if="selectedSeverity.normal">{{messages.NORMAL_NO_SENSOR_DATA}}</span>
+    <!-- end message -->
+  </section>
 
-	<section id="sensor-categories" class="row column" ng-show="filteredSensorData.length">
-		<div class="row column header-row">
-			<div class="column large-12 header__actions-bar">
-				<p class="inline sensor__title">Sensors</p>
-				<p class="inline sensor__reading">Low critical</p>
-				<p class="inline sensor__reading">Low warning</p>
-				<p class="inline sensor__reading sensor__heading-current">Current</p>
-				<p class="inline sensor__reading">High warning</p>
-				<p class="inline sensor__reading">High critical</p>
-			</div>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" ng-repeat="sensor in data|filter:filterBySeverity|filter:filterBySearchTerms|orderBy:'+custom_order' as filteredSensorData">
-			<p class="inline sensor__title"><span class="icon" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="sensor.status" ></span>{{sensor.title}}</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>{{sensor.CriticalLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>{{sensor.WarningLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
-			<p class="inline sensor__reading sensor__current" ng-class="{'sensor__critical': sensor.status == 'critical', 'sensor__warn': sensor.status == 'warning', 'sensor__normal': sensor.status == 'normal'}"><span class="sensor__label">Current</span>{{sensor.Value}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>{{sensor.WarningHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>{{sensor.CriticalHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
-		</div>
-	</section>
+  <section id="sensor-categories" class="row column" ng-show="filteredSensorData.length">
+    <div class="row column header-row">
+      <div class="column large-12 header__actions-bar">
+        <p class="inline sensor__title">Sensors</p>
+        <p class="inline sensor__reading">Low critical</p>
+        <p class="inline sensor__reading">Low warning</p>
+        <p class="inline sensor__reading sensor__heading-current">Current</p>
+        <p class="inline sensor__reading">High warning</p>
+        <p class="inline sensor__reading">High critical</p>
+      </div>
+    </div>
+    <!-- sensor -->
+    <div class="sensor__readings-row" ng-repeat="sensor in data|filter:filterBySeverity|filter:filterBySearchTerms|orderBy:'+custom_order' as filteredSensorData">
+      <p class="inline sensor__title"><span class="icon" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="sensor.status" ></span>{{sensor.title}}</p>
+      <p class="inline sensor__reading"><span class="sensor__label">Low critical</span>{{sensor.CriticalLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
+      <p class="inline sensor__reading"><span class="sensor__label">Low warning</span>{{sensor.WarningLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
+      <p class="inline sensor__reading sensor__current" ng-class="{'sensor__critical': sensor.status == 'critical', 'sensor__warn': sensor.status == 'warning', 'sensor__normal': sensor.status == 'normal'}"><span class="sensor__label">Current</span>{{sensor.Value}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></span></p>
+      <p class="inline sensor__reading"><span class="sensor__label">High warning</span>{{sensor.WarningHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
+      <p class="inline sensor__reading"><span class="sensor__label">High critical</span>{{sensor.CriticalHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
+    </div>
+  </section>
 </div>
\ No newline at end of file
diff --git a/app/users/controllers/user-accounts-controller.html b/app/users/controllers/user-accounts-controller.html
index 49d79a8..4b243aa 100644
--- a/app/users/controllers/user-accounts-controller.html
+++ b/app/users/controllers/user-accounts-controller.html
@@ -1,46 +1,46 @@
 <div id="user-accounts">
-	<div class="row column">
-		<h1>Manage user account</h1>
-		<div class="column small-12 page-header">
-			<h2 class="h4">Change password</h2>
-		</div>
-	</div>
-	<section class="row column" aria-label="change password form">
-		<form class="user-manage__form" role="form" action="">
-			<fieldset>
-				<legend aria-label="user manager" class="accessible-text">Change password form</legend>
-				<div class="row column">
-					<label for="user-manage__current-password">Current password</label>
-					<input id="user-manage__current-password" type="password" ng-model="oldPassword" class="user-manage__current-password inline"/>
-				</div>
-				<div class="inline">
-					<label for="user-manage__new-password">New password</label>
-					<div class="user-manage__input-wrapper inline">
-						<input id="user-manage__new-password" type="{{showpassword ? 'text' : 'password'}}" ng-model="password" class="user-manage__new-password inline"/>
-						<button ng-model="showpassword" ng-click="togglePassword = !togglePassword; showpassword = !showpassword;" class="password-toggle">
-							<span ng-hide="togglePassword">Show</span>
-							<span ng-show="togglePassword">Hide</span>
-						</button>
-					</div>
-				</div>
-				<div class="inline">
-					<label for="user-manage__verify-password">Retype new password</label>
-					<div class="user-manage__input-wrapper inline">
-						<input id="user-manage__verify-password" type="{{showpasswordVerify ? 'text' : 'password'}}" ng-model="passwordVerify" class="user-manage__verify-password inline"/>
-						<button ng-model="showpasswordVerify" ng-click="toggleVerify = !toggleVerify; showpasswordVerify = !showpasswordVerify;" class="password-toggle">
-							<span ng-hide="toggleVerify">Show</span>
-							<span ng-show="toggleVerify">Hide</span>
-						</button>
-					</div>
-				</div>
-			</fieldset>
-			<div class="user-manage__submit-wrapper">
-			<button class="btn-primary inline" ng-click="changePassword(oldPassword, password, passwordVerify)">Save change</button>
-			</div>
-			<p ng-class="'change-password__' + state"  role="alert">
-				{{state === 'error' ? errorMsg : ''}}
-				{{state === 'success' ? 'Success! User Password has been changed!' : ''}}
-			</p>
-		</form>
-	</section>
+  <div class="row column">
+    <h1>Manage user account</h1>
+    <div class="column small-12 page-header">
+      <h2 class="h4">Change password</h2>
+    </div>
+  </div>
+  <section class="row column" aria-label="change password form">
+    <form class="user-manage__form" role="form" action="">
+      <fieldset>
+        <legend aria-label="user manager" class="accessible-text">Change password form</legend>
+        <div class="row column">
+          <label for="user-manage__current-password">Current password</label>
+          <input id="user-manage__current-password" type="password" ng-model="oldPassword" class="user-manage__current-password inline"/>
+        </div>
+        <div class="inline">
+          <label for="user-manage__new-password">New password</label>
+          <div class="user-manage__input-wrapper inline">
+            <input id="user-manage__new-password" type="{{showpassword ? 'text' : 'password'}}" ng-model="password" class="user-manage__new-password inline"/>
+            <button ng-model="showpassword" ng-click="togglePassword = !togglePassword; showpassword = !showpassword;" class="password-toggle">
+              <span ng-hide="togglePassword">Show</span>
+              <span ng-show="togglePassword">Hide</span>
+            </button>
+          </div>
+        </div>
+        <div class="inline">
+          <label for="user-manage__verify-password">Retype new password</label>
+          <div class="user-manage__input-wrapper inline">
+            <input id="user-manage__verify-password" type="{{showpasswordVerify ? 'text' : 'password'}}" ng-model="passwordVerify" class="user-manage__verify-password inline"/>
+            <button ng-model="showpasswordVerify" ng-click="toggleVerify = !toggleVerify; showpasswordVerify = !showpasswordVerify;" class="password-toggle">
+              <span ng-hide="toggleVerify">Show</span>
+              <span ng-show="toggleVerify">Hide</span>
+            </button>
+          </div>
+        </div>
+      </fieldset>
+      <div class="user-manage__submit-wrapper">
+      <button class="btn-primary inline" ng-click="changePassword(oldPassword, password, passwordVerify)">Save change</button>
+      </div>
+      <p ng-class="'change-password__' + state"  role="alert">
+        {{state === 'error' ? errorMsg : ''}}
+        {{state === 'success' ? 'Success! User Password has been changed!' : ''}}
+      </p>
+    </form>
+  </section>
 </div>