diff --git a/pages/options/options.css b/pages/options/options.css
index c0bfa82f4896a3ad61b21321cb903eabc768a8e3..3a9a541234bc0f505cb9b8f32cf5bb5f14b2ca19 100644
--- a/pages/options/options.css
+++ b/pages/options/options.css
@@ -1,17 +1,25 @@
-section {
-    padding-left: 32px;
-}
+/**
+ * Titles
+ */
 
-section .title {
-    -webkit-margin-start: -32px;
+.option-title {
     font-weight: bold;
 }
 
-section .description {
-    font-style: italic;
-    margin-bottom: 16px;
+/**
+ * Controls
+ */
+
+.text-input {
+    margin-left: 36px !important;
 }
 
-.button-panel {
-    text-align: right;
+/**
+ * Miscellaneous
+ */
+
+.option-description {
+    font-style: italic;
+    margin-bottom: 16px;
+    padding-left: 36px;
 }
diff --git a/pages/options/options.html b/pages/options/options.html
index 8d2a30dcf5a7b48b18fc993456dc718f76c4cebd..1b0d13335d1a45998f232e57c7d67ee25593dfd9 100644
--- a/pages/options/options.html
+++ b/pages/options/options.html
@@ -19,20 +19,20 @@
 
         <section>
 
-            <label class="title">
+            <label class="option-title">
                 <input data-option="blockMissing" type="checkbox">
                 <span data-i18n-content="blockMissingTitle"></span>
             </label>
 
-            <div class="description" data-i18n-content="blockMissingDescription"></div>
+            <div class="option-description" data-i18n-content="blockMissingDescription"></div>
 
         </section>
 
         <section>
 
-            <div class="title" data-i18n-content="domainWhitelistTitle"></div>
-            <input data-option="domainWhitelist" type="text">
-            <div class="description" data-i18n-content="domainWhitelistDescription"></div>
+            <div class="option-title" data-i18n-content="domainWhitelistTitle"></div>
+            <input class="text-input" data-option="domainWhitelist" type="text">
+            <div class="option-description" data-i18n-content="domainWhitelistDescription"></div>
 
         </section>
 
diff --git a/pages/options/options.js b/pages/options/options.js
index b4ab713b0d7c18103c6fe010508a1ceae7895c21..22c35323e244329e580e2496158d58bf64e86fa4 100644
--- a/pages/options/options.js
+++ b/pages/options/options.js
@@ -27,10 +27,9 @@ const VALUE_SEPARATOR = ';';
 
 document.addEventListener('DOMContentLoaded', function () {
 
-    let i18nElements, saveButtonElement, blockMissingElement, domainWhitelistElement;
+    let i18nElements, blockMissingElement, domainWhitelistElement;
 
     i18nElements = document.querySelectorAll('[data-i18n-content]');
-    saveButtonElement = document.getElementById('save-button');
 
     i18nElements.forEach(function (i18nElement) {