diff --git a/src/header.html b/src/header.html
index 7c14f2f..13584cf 100644
--- a/src/header.html
+++ b/src/header.html
@@ -10,8 +10,8 @@
     <div class="logo__wrapper"></div>
     <div class="header__functions">
         <a href="">Server health<span class="status-light__error">Error</span></a>
-        <a href="power-operations.html" class="header__server-power">Server power<span class="status-light__good">On</span></a>
+        <a href="power-operations.html" class="header__server-power" role="button">Server power<span class="status-light__good">On</span></a>
         <p class="header__refresh">Page last refreshed <span>3:20:12 Feb 12 2017</span></p>
-        <button class="header__page-refresh"><img src="img/icon-refresh-white.svg" /></button>
+        <button class="header__page-refresh"><img src="img/icon-refresh-white.svg" alt="refresh page" role="button"/></button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/logo.html b/src/logo.html
index a938e89..ec78a36 100644
--- a/src/logo.html
+++ b/src/logo.html
@@ -1 +1 @@
-<img src="img/logo.svg" id="header__logo" />
\ No newline at end of file
+<img src="img/logo.svg" id="header__logo" alt="company logo"/>
\ No newline at end of file
diff --git a/src/navigation.html b/src/navigation.html
index 1ebc768..ddfa648 100644
--- a/src/navigation.html
+++ b/src/navigation.html
@@ -1,7 +1,7 @@
 <nav role="navigation">
     <ul id="nav__top-level">
         <li>
-            <button class="btn-overview opened">
+            <button class="btn-overview opened" tabindex="1">
                 <svg version="1.1" class="nav__icon" x="0px" y="0px"
                      viewBox="0 0 20 20">
                     <g>
@@ -18,10 +18,10 @@
                     </g>
                 </svg>
 
-                <span class="">Overview</span></button>
+                <span class="" >Overview</span></button>
         </li>
         <li>
-            <button class="btn-settings">
+            <button class="btn-settings" tabindex="6">
                 <svg class="nav__icon" viewBox="0 0 20 20">
                     <path d="M17.498,11.697c-0.453-0.453-0.704-1.055-0.704-1.697c0-0.642,0.251-1.244,0.704-1.697c0.069-0.071,0.15-0.141,0.257-0.22c0.127-0.097,0.181-0.262,0.137-0.417c-0.164-0.558-0.388-1.093-0.662-1.597c-0.075-0.141-0.231-0.22-0.391-0.199c-0.13,0.02-0.238,0.027-0.336,0.027c-1.325,0-2.401-1.076-2.401-2.4c0-0.099,0.008-0.207,0.027-0.336c0.021-0.158-0.059-0.316-0.199-0.391c-0.503-0.274-1.039-0.498-1.597-0.662c-0.154-0.044-0.32,0.01-0.416,0.137c-0.079,0.106-0.148,0.188-0.22,0.257C11.244,2.956,10.643,3.207,10,3.207c-0.642,0-1.244-0.25-1.697-0.704c-0.071-0.069-0.141-0.15-0.22-0.257C7.987,2.119,7.821,2.065,7.667,2.109C7.109,2.275,6.571,2.497,6.07,2.771C5.929,2.846,5.85,3.004,5.871,3.162c0.02,0.129,0.027,0.237,0.027,0.336c0,1.325-1.076,2.4-2.401,2.4c-0.098,0-0.206-0.007-0.335-0.027C3.001,5.851,2.845,5.929,2.77,6.07C2.496,6.572,2.274,7.109,2.108,7.667c-0.044,0.154,0.01,0.32,0.137,0.417c0.106,0.079,0.187,0.148,0.256,0.22c0.938,0.936,0.938,2.458,0,3.394c-0.069,0.072-0.15,0.141-0.256,0.221c-0.127,0.096-0.181,0.262-0.137,0.416c0.166,0.557,0.388,1.096,0.662,1.596c0.075,0.143,0.231,0.221,0.392,0.199c0.129-0.02,0.237-0.027,0.335-0.027c1.325,0,2.401,1.076,2.401,2.402c0,0.098-0.007,0.205-0.027,0.334C5.85,16.996,5.929,17.154,6.07,17.23c0.501,0.273,1.04,0.496,1.597,0.66c0.154,0.047,0.32-0.008,0.417-0.137c0.079-0.105,0.148-0.186,0.22-0.256c0.454-0.453,1.055-0.703,1.697-0.703c0.643,0,1.244,0.25,1.697,0.703c0.071,0.07,0.141,0.15,0.22,0.256c0.073,0.098,0.188,0.152,0.307,0.152c0.036,0,0.073-0.004,0.109-0.016c0.558-0.164,1.096-0.387,1.597-0.66c0.141-0.076,0.22-0.234,0.199-0.393c-0.02-0.129-0.027-0.236-0.027-0.334c0-1.326,1.076-2.402,2.401-2.402c0.098,0,0.206,0.008,0.336,0.027c0.159,0.021,0.315-0.057,0.391-0.199c0.274-0.5,0.496-1.039,0.662-1.596c0.044-0.154-0.01-0.32-0.137-0.416C17.648,11.838,17.567,11.77,17.498,11.697 M16.671,13.334c-0.059-0.002-0.114-0.002-0.168-0.002c-1.749,0-3.173,1.422-3.173,3.172c0,0.053,0.002,0.109,0.004,0.166c-0.312,0.158-0.64,0.295-0.976,0.406c-0.039-0.045-0.077-0.086-0.115-0.123c-0.601-0.6-1.396-0.93-2.243-0.93s-1.643,0.33-2.243,0.93c-0.039,0.037-0.077,0.078-0.116,0.123c-0.336-0.111-0.664-0.248-0.976-0.406c0.002-0.057,0.004-0.113,0.004-0.166c0-1.75-1.423-3.172-3.172-3.172c-0.054,0-0.11,0-0.168,0.002c-0.158-0.312-0.293-0.639-0.405-0.975c0.044-0.039,0.085-0.078,0.124-0.115c1.236-1.236,1.236-3.25,0-4.486C3.009,7.719,2.969,7.68,2.924,7.642c0.112-0.336,0.247-0.664,0.405-0.976C3.387,6.668,3.443,6.67,3.497,6.67c1.75,0,3.172-1.423,3.172-3.172c0-0.054-0.002-0.11-0.004-0.168c0.312-0.158,0.64-0.293,0.976-0.405C7.68,2.969,7.719,3.01,7.757,3.048c0.6,0.6,1.396,0.93,2.243,0.93s1.643-0.33,2.243-0.93c0.038-0.039,0.076-0.079,0.115-0.123c0.336,0.112,0.663,0.247,0.976,0.405c-0.002,0.058-0.004,0.114-0.004,0.168c0,1.749,1.424,3.172,3.173,3.172c0.054,0,0.109-0.002,0.168-0.004c0.158,0.312,0.293,0.64,0.405,0.976c-0.045,0.038-0.086,0.077-0.124,0.116c-0.6,0.6-0.93,1.396-0.93,2.242c0,0.847,0.33,1.645,0.93,2.244c0.038,0.037,0.079,0.076,0.124,0.115C16.964,12.695,16.829,13.021,16.671,13.334 M10,5.417c-2.528,0-4.584,2.056-4.584,4.583c0,2.529,2.056,4.584,4.584,4.584s4.584-2.055,4.584-4.584C14.584,7.472,12.528,5.417,10,5.417 M10,13.812c-2.102,0-3.812-1.709-3.812-3.812c0-2.102,1.71-3.812,3.812-3.812c2.102,0,3.812,1.71,3.812,3.812C13.812,12.104,12.102,13.812,10,13.812"></path>
                 </svg>
@@ -44,10 +44,10 @@
         </li>
     </ul>
     <ul class="nav__second-level btn-overview">
-        <li><a href="">System Overview</a></li>
-        <li class="active"><a href="power-operations.html">Server power operations</a></li>
-        <li><a href="">Power consumption</a></li>
-        <li><a href="">Remote console</a></li>
+        <li tabindex="2"><a href="">System Overview</a></li>
+        <li tabindex="3"class="active"><a href="power-operations.html">Server power operations</a></li>
+        <li tabindex="4"><a href="">Power consumption</a></li>
+        <li tabindex="5"><a href="">Remote console</a></li>
     </ul>
     <ul class="nav__second-level btn-settings">
         <li><a href="">2nd level 4</a></li>
diff --git a/src/power-operations.html b/src/power-operations.html
index 9ddbc70..b1913ea 100644
--- a/src/power-operations.html
+++ b/src/power-operations.html
@@ -22,14 +22,14 @@
     <!-- Current status and bar display the state of the server. Class 'power__state-off' is applied to bar and 'power__state' text switches to say "off"-->
     <div class="row column">
         <div class="power__current-status ">
-            <p class="inline h4">Current status</p>
+            <h2 class="inline h4">Current status</h2>
             <span class="power__status-log inline float-right">Server last reset at 01:41:24 on 02/17/17</span>
         </div>
     </div>
     <div class="row column">
         <div id="power-indicator-bar" class="power__indicator-bar power__state-on">
             <p class="inline">Server BLZ_109284.209.01</p>
-            <p class="power__state inline float-right h3"><span>On</span></p>
+            <h3 class="power__state inline float-right"><span>On</span></h3>
         </div>
     </div>
     <div class="row column">
@@ -39,25 +39,25 @@
 
         <!-- Power on displays only when server is shutdown -->
         <div class="row column power-option">
-            <button id="power__power-on" class="btn-secondary">Power On</button>
+            <button id="power__power-on" class="btn-secondary" role="button">Power On</button>
             <p>Attempts to power on the server</p>
         </div>
 
         <!-- Power reboot/shutdown options : when server is off all of these are hidden. When one option is selected, the others are disabled. -->
         <div class="row column power-option">
-            <button id="power__warm-boot" class="btn-secondary">Warm reboot</button>
+            <button id="power__warm-boot" class="btn-secondary" role="button">Warm reboot</button>
             <p>Attempts to perform an orderly shutdown before restarting the server</p>
         </div>
         <div class="row column power-option">
-            <button id="power__cold-boot" class="btn-secondary">Cold reboot</button>
+            <button id="power__cold-boot" class="btn-secondary" role="button">Cold reboot</button>
             <p>Shuts down the server immediately, then restarts it</p>
         </div>
         <div class="row column power-option">
-            <button id="power__soft-shutdown" class="btn-secondary">Orderly shutdown</button>
+            <button id="power__soft-shutdown" class="btn-secondary" role="button">Orderly shutdown</button>
             <p>Attempts to stop all software on the server before removing power</p>
         </div>
         <div class="row column power-option">
-            <button id="power__hard-shutdown" class="btn-secondary">Immediate shutdown</button>
+            <button id="power__hard-shutdown" class="btn-secondary" role="button">Immediate shutdown</button>
             <p>Removes power from the server without waiting for software to stop</p>
 
             <!-- Confirmation message - to accommodate the message for smaller screens we need to grab the height of the message and apply that height to "power-option" row
diff --git a/src/scss/base/_buttons.scss b/src/scss/base/_buttons.scss
index 27a8466..5cc38d4 100644
--- a/src/scss/base/_buttons.scss
+++ b/src/scss/base/_buttons.scss
@@ -22,11 +22,12 @@
   }
 }
 
-.btn-primary {
+.btn-primary,
+input[type="submit"] {
   color: $primebtn__text;
   background: $primebtn__bg;
   &:hover {
-    background: rgba(60,109,240,.8);
+    background: lighten($primebtn__bg, 8%);
     @include fastTransition-all;
   }
   &.disabled {
diff --git a/src/scss/components/_power-ops.scss b/src/scss/components/_power-ops.scss
index a5cc1f8..d41ebee 100644
--- a/src/scss/components/_power-ops.scss
+++ b/src/scss/components/_power-ops.scss
@@ -9,6 +9,7 @@
   // Power op time stamp
   .power__status-log {
     color: $darkgrey;
+    font-weight:500;
   }
 
   // Power Curernt status wrapper
@@ -23,12 +24,16 @@
 
   // Power state indicator on/off
   .power__state {
+    font-weight: 700;
+    margin-top: -.3em;
     span:before {
       content: '\25CF';
       display: inline-block;
-      font-size: 1.2em;
+      font-size: 1.8em;
       color: $darkgrey;
-      margin-right: .3em;
+      margin-right: .1em;
+      vertical-align: middle;
+      transform: translateY(-4px);
       @include slowTransition-all;
     }
   }