diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 27b122d..ba48a49 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -679,6 +679,45 @@
             data: JSON.stringify({'data': state})
           })
         },
+        getBootOptions: function() {
+          return $http({
+                   method: 'GET',
+                   url: DataService.getHost() + '/redfish/v1/Systems/system',
+                   withCredentials: true
+                 })
+              .then(function(response) {
+                return response.data;
+              });
+        },
+        saveBootSettings: function(data) {
+          return $http({
+            method: 'PATCH',
+            url: DataService.getHost() + '/redfish/v1/Systems/system',
+            withCredentials: true,
+            data: data
+          });
+        },
+        getTPMStatus: function() {
+          return $http({
+                   method: 'GET',
+                   url: DataService.getHost() +
+                       '/xyz/openbmc_project/control/host0/TPMEnable',
+                   withCredentials: true
+                 })
+              .then(function(response) {
+                return response.data;
+              });
+        },
+        saveTPMEnable: function(data) {
+          return $http({
+            method: 'PUT',
+            url: DataService.getHost() +
+                '/xyz/openbmc_project/control/host0/TPMEnable/attr/TPMEnable',
+            withCredentials: true,
+            data: JSON.stringify({'data': data})
+          })
+        },
+
         bmcReboot: function() {
           return $http({
             method: 'PUT',
diff --git a/app/common/services/constants.js b/app/common/services/constants.js
index ae82e76..37dd29f 100644
--- a/app/common/services/constants.js
+++ b/app/common/services/constants.js
@@ -113,11 +113,11 @@
               'Time out. Did not download image in allotted time.',
         },
         POWER_OP: {
-          POWER_ON_FAILED: 'Power On Failed',
-          WARM_REBOOT_FAILED: 'Warm Reboot Failed',
-          COLD_REBOOT_FAILED: 'Cold Reboot Failed',
-          ORDERLY_SHUTDOWN_FAILED: 'Orderly Shutdown Failed',
-          IMMEDIATE_SHUTDOWN_FAILED: 'Immediate Shutdown Failed',
+          POWER_ON_FAILED: 'Power on failed.',
+          WARM_REBOOT_FAILED: 'Warm reboot failed.',
+          COLD_REBOOT_FAILED: 'Cold reboot failed.',
+          ORDERLY_SHUTDOWN_FAILED: 'Orderly shutdown failed.',
+          IMMEDIATE_SHUTDOWN_FAILED: 'Immediate shutdown failed.',
         },
         SENSOR: {
           NO_SENSOR_DATA: 'There are no sensors found.',
diff --git a/app/common/styles/elements/modals.scss b/app/common/styles/elements/modals.scss
index 0e21a39..450a26b 100644
--- a/app/common/styles/elements/modals.scss
+++ b/app/common/styles/elements/modals.scss
@@ -107,6 +107,15 @@
 }
 .uib-modal__content {
   padding: 1em;
+  .modal-header {
+    display: block;
+  }
+  .btn--close {
+    padding: 0;
+    svg {
+      height: 1.6em;
+    }
+  }
 }
 
 .uib-modal {
@@ -118,4 +127,4 @@
       height: 2em;
     }
   }
-}
\ No newline at end of file
+}