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>