DOMUI Options: Fix vertical alignment of radio and checkboxes

This also makes the label text line up correctly if the label needs to wrap.

This also fixes a bug where the menu could be scrolled off the screen.

I went through and fixed a bunch of indentation errors in the HTML I touched.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3590006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61544 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 624 insertions, 442 deletions

diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 349ed38..b9b33fba 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -12,24 +12,31 @@
       <div i18n-content="disableServices"></div>
       <div><a target="_blank" i18n-content="privacyLearnMoreLabel"
           i18n-values="href:privacyLearnMoreURL"></a></div>
-      <label><input id="alternateErrorPagesEnabled"
-          pref="alternate_error_pages.enabled"
-          metric="Options_LinkDoctorCheckbox" type="checkbox"><span
-          i18n-content="linkDoctorPref"></span></label>
-      <label><input id="searchSuggestEnabled"
-          pref="search.suggest_enabled" metric="Options_UseSuggestCheckbox"
-          type="checkbox"><span i18n-content="suggestPref"></span></label>
-      <label><input id="dnsPrefetchingEnabled"
-          pref="dns_prefetching.enabled" metric="Options_DnsPrefetchCheckbox"
-          type="checkbox"><span
-          i18n-content="networkDNSPrefetchEnabledDescription"></span></label>
-      <label><input id="safeBrowsingEnabled"
-          pref="safebrowsing.enabled" metric="Options_SafeBrowsingCheckbox"
-          type="checkbox"><span i18n-content="safeBrowsingEnableProtection">
-          </span></label>
+      <label class="checkbox">
+        <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled"
+            metric="Options_LinkDoctorCheckbox" type="checkbox">
+        <span i18n-content="linkDoctorPref"></span>
+      </label>
+      <label class="checkbox">
+        <input id="searchSuggestEnabled" pref="search.suggest_enabled"
+            metric="Options_UseSuggestCheckbox" type="checkbox">
+        <span i18n-content="suggestPref"></span>
+      </label>
+      <label class="checkbox">
+        <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
+            metric="Options_DnsPrefetchCheckbox" type="checkbox">
+        <span i18n-content="networkDNSPrefetchEnabledDescription"></span>
+      </label>
+      <label class="checkbox">
+        <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
+            metric="Options_SafeBrowsingCheckbox" type="checkbox">
+        <span i18n-content="safeBrowsingEnableProtection"></span>
+      </label>
 <if expr="pp_ifdef('_google_chrome')">
-      <label><input id="metricsReportingEnabled" type="checkbox"><span
-          i18n-content="enableLogging"></span></label>
+      <label class="checkbox">
+        <input id="metricsReportingEnabled" type="checkbox">
+        <span i18n-content="enableLogging"></span>
+      </label>
 </if>
     </div>
   </section>
@@ -44,9 +51,11 @@
   <section>
     <h3 i18n-content="advancedSectionTitleTranslate"></h3>
     <div>
-      <label><input id="enableTranslate"
-          pref="translate.enabled" metric="Options_Translate" type="checkbox">
-          <span i18n-content="translateEnableTranslate"></span></label>
+      <label class="checkbox">
+        <input id="enableTranslate" pref="translate.enabled"
+            metric="Options_Translate" type="checkbox">
+        <span i18n-content="translateEnableTranslate"></span>
+      </label>
     </div>
   </section>
   <section>
@@ -59,10 +68,11 @@
         <button id="downloadLocationBrowseButton"
             i18n-content="downloadLocationBrowseButton"></button>
       </div>
-      <label><input id="promptForDownload"
-          pref="download.prompt_for_download"
-          metric="Options_AskForSaveLocation" type="checkbox"><span
-          i18n-content="downloadLocationAskForSaveLocation"></span></label>
+      <label class="checkbox">
+        <input id="promptForDownload" pref="download.prompt_for_download"
+            metric="Options_AskForSaveLocation" type="checkbox">
+        <span i18n-content="downloadLocationAskForSaveLocation"></span>
+      </label>
 </if>
       <div i18n-content="autoOpenFileTypesInfo"></div>
       <div><button id="autoOpenFileTypesResetToDefault"
@@ -73,9 +83,11 @@
     <h3 i18n-content="advancedSectionTitleContent"></h3>
     <div>
 <if expr="os == 'darwin'">
-      <label><input id="tabsToLinksPref"
-          pref="webkit.webprefs.tabs_to_links" metric="Options_TabsToLinks"
-          type="checkbox"><span i18n-content="tabsToLinksPref"></span></label>
+      <label class="checkbox">
+        <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links"
+            metric="Options_TabsToLinks" type="checkbox">
+        <span i18n-content="tabsToLinksPref"></span>
+      </label>
 </if>
       <div><button id="fontSettingsConfigureFontsOnlyButton"
           i18n-content="fontSettingsConfigureFontsOnlyButton"></button></div>
@@ -98,28 +110,37 @@
           i18n-content="certificatesManageButton"></button></div>
 <if expr="os == 'win32'">
       <!-- Configure these options for manual handling on windows -->
-      <label><input id="sslCheckRevocation"
-          type="checkbox"><span i18n-content="sslCheckRevocation"></span>
+      <label class="checkbox">
+        <input id="sslCheckRevocation" type="checkbox">
+        <span i18n-content="sslCheckRevocation"></span>
       </label>
-      <label><input id="sslUseSSL2"
-          type="checkbox"><span i18n-content="sslUseSSL2"></span>
+      <label class="checkbox">
+        <input id="sslUseSSL2" type="checkbox">
+        <span i18n-content="sslUseSSL2"></span>
       </label>
 </if>
 <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)">
       <!-- Configure these options for Linux/BSD as preference keys -->
-      <label><input id="sslCheckRevocation"
-          pref="ssl.rev_checking.enabled" metric="Options_CheckCertRevocation"
-          type="checkbox"><span i18n-content="sslCheckRevocation"></span>
-          </label>
-      <label><input id="sslUseSSL2"
-          pref="ssl.ssl2.enabled" metric="Options_SSL2" type="checkbox"><span
-          i18n-content="sslUseSSL2"></span></label>
-      <label><input id="sslUseSSL3"
-          pref="ssl.ssl3.enabled" metric="Options_SSL3" type="checkbox"><span
-          i18n-content="sslUseSSL3"></span></label>
-      <label><input id="sslUseTLS1"
-          pref="ssl.tls1.enabled" metric="Options_TLS1" type="checkbox"><span
-          i18n-content="sslUseTLS1"></span></label>
+      <label class="checkbox">
+        <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled"
+            metric="Options_CheckCertRevocation" type="checkbox">
+        <span i18n-content="sslCheckRevocation"></span>
+      </label>
+      <label class="checkbox">
+        <input id="sslUseSSL2" pref="ssl.ssl2.enabled" metric="Options_SSL2"
+            type="checkbox">
+        <span i18n-content="sslUseSSL2"></span>
+      </label>
+      <label class="checkbox">
+        <input id="sslUseSSL3" pref="ssl.ssl3.enabled" metric="Options_SSL3"
+            type="checkbox">
+        <span i18n-content="sslUseSSL3"></span>
+      </label>
+      <label class="checkbox">
+        <input id="sslUseTLS1" pref="ssl.tls1.enabled" metric="Options_TLS1"
+            type="checkbox">
+        <span i18n-content="sslUseTLS1"></span>
+      </label>
 </if>
     </div>
   </section>
@@ -127,7 +148,7 @@
   <section id="background-mode-section">
     <h3 i18n-content="advancedSectionTitleChromeApps"></h3>
     <div>
-      <label class="multi-line-wrap">
+      <label class="checkbox">
         <input pref="background_mode.enabled"
             metric="Options_BackgroundMode" type="checkbox">
         <span i18n-content="chromeAppsEnableBackgroundMode"></span>
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
index 169ba1a..fe357c5 100644
--- a/chrome/browser/resources/options/autofill_options.html
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -6,9 +6,11 @@
   </h1>
 
   <div class="autofill-section">
-    <label><input id="autoFillEnabled" pref="autofill.enabled"
-        metric="Options_FormAutofill" type="checkbox">
-        <span i18n-content="autoFillEnabled"></span></label>
+    <label class="checkbox">
+      <input id="autoFillEnabled" pref="autofill.enabled"
+          metric="Options_FormAutofill" type="checkbox">
+      <span i18n-content="autoFillEnabled"></span>
+    </label>
   </div>
 
   <div class="autofill-section" id="profileSelectContainer">
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index a713416..403609c 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -3,15 +3,15 @@
   <section>
     <h3 i18n-content="startupGroupName"></h3>
     <div>
-      <label><input type="radio" name="startup"
+      <label class="radio"><input type="radio" name="startup"
           pref="session.restore_on_startup" value="0"
           metric="Options_Startup_Homepage">
           <span i18n-content="startupShowDefaultAndNewTab"></span></label>
-      <label><input type="radio" name="startup"
+      <label class="radio"><input type="radio" name="startup"
           pref="session.restore_on_startup" value="1"
           metric="Options_Startup_LastSession">
           <span i18n-content="startupShowLastSession"></span></label>
-      <label><input type="radio" name="startup" id="startupShowPagesButton"
+      <label class="radio"><input type="radio" name="startup" id="startupShowPagesButton"
           pref="session.restore_on_startup" value="4"
           metric="Options_Startup_Custom">
           <span i18n-content="startupShowPages"></span></label>
@@ -35,22 +35,25 @@
   <section>
     <h3 i18n-content="homepageGroupName"></h3>
     <div>
-      <label><input type="radio" name="homepage" id="homepageUseNTPButton"
-          value="true"
-          metric="Options_Homepage_IsNewTabPage">
-          <span i18n-content="homepageUseNewTab"></span></label>
-      <label><input type="radio" name="homepage" id="homepageUseURLButton"
-          value="false"
-          metric="Options_Homepage_IsNewTabPage">
-          <span i18n-content="homepageUseURL"></span></label>
+      <label class="radio">
+        <input type="radio" name="homepage" id="homepageUseNTPButton"
+            value="true" metric="Options_Homepage_IsNewTabPage">
+        <span i18n-content="homepageUseNewTab"></span>
+      </label>
+      <label class="radio">
+        <input type="radio" name="homepage" id="homepageUseURLButton"
+            value="false" metric="Options_Homepage_IsNewTabPage">
+        <span i18n-content="homepageUseURL"></span>
+      </label>
       <div class="suboption">
         <input id="homepageURL" type="url">
       </div>
       <div class="option">
-        <label><input id="homepageShowButton"
-            pref="browser.show_home_button"
-            metric="Options_Homepage_HomeButton" type="checkbox">
-            <span i18n-content="homepageShowButton"></span></label>
+        <label class="checkbox">
+          <input id="homepageShowButton" pref="browser.show_home_button"
+              metric="Options_Homepage_HomeButton" type="checkbox">
+          <span i18n-content="homepageShowButton"></span>
+        </label>
       </div>
     </div>
   </section>
diff --git a/chrome/browser/resources/options/chromeos_accounts_options.html b/chrome/browser/resources/options/chromeos_accounts_options.html
index 1439259..f3cc8ed 100644
--- a/chrome/browser/resources/options/chromeos_accounts_options.html
+++ b/chrome/browser/resources/options/chromeos_accounts_options.html
@@ -18,19 +18,31 @@
     </td></tr>
     <tr><td>&nbsp;</td></tr>
     <tr>
-      <td class="option-name"><label><input id="allowBwsiCheck"
-           pref="cros.accounts.allowBWSI" type="checkbox"><span
-           i18n-content="allow_BWSI"></span></label></td>
+      <td class="option-name">
+        <label class="checkbox">
+          <input id="allowBwsiCheck" pref="cros.accounts.allowBWSI"
+              type="checkbox">
+          <span i18n-content="allow_BWSI"></span>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label><input id="allowGuestCheck"
-           pref="cros.accounts.allowGuest" type="checkbox"><span
-           i18n-content="allow_guest"></span></label></td>
+      <td class="option-name">
+        <label class="checkbox">
+          <input id="allowGuestCheck" pref="cros.accounts.allowGuest"
+               type="checkbox">
+          <span i18n-content="allow_guest"></span>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label><input id="showUserNamesCheck"
-           pref="cros.accounts.showUserNamesOnSignIn" type="checkbox"><span
-           i18n-content="show_user_on_signin"></span></label></td>
+      <td class="option-name">
+        <label class="checkbox">
+          <input id="showUserNamesCheck"
+              pref="cros.accounts.showUserNamesOnSignIn" type="checkbox">
+          <span i18n-content="show_user_on_signin"></span>
+        </label>
+      </td>
     </tr>
     </table>
   </div>
diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html
index 7b1ae6a..782c278 100644
--- a/chrome/browser/resources/options/chromeos_internet_detail.html
+++ b/chrome/browser/resources/options/chromeos_internet_detail.html
@@ -7,9 +7,12 @@
         <td id="inetSsid" class="option-value"></td>
       </tr>
       <tr>
-        <td><input id="rememberNetwork"
-                   type="checkbox"></label></td>
-        <td><label><span i18n-content="inetRememberNetwork"></span></td>
+        <td colspan="2">
+          <label class="checkbox">
+            <input id="rememberNetwork"type="checkbox">
+            <span i18n-content="inetRememberNetwork"></span>
+          </label>
+        </td>
       </tr>
     </table>
   </section>
diff --git a/chrome/browser/resources/options/chromeos_labs.html b/chrome/browser/resources/options/chromeos_labs.html
index 71c3b22..66d245b 100644
--- a/chrome/browser/resources/options/chromeos_labs.html
+++ b/chrome/browser/resources/options/chromeos_labs.html
@@ -3,23 +3,31 @@
   <section>
     <h3 i18n-content="mediaplayer_title"></h3>
     <div class="option">
-       <table class="option-control-table">
-       <tr>
-         <td class="option-name"><label><input id="mediaplayer-check"
-              pref="settings.labs.mediaplayer" type="checkbox"><span
-              i18n-content="mediaplayer"></span></label></td>
-       </tr>
-       </table>
+      <table class="option-control-table">
+      <tr>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="mediaplayer-check" pref="settings.labs.mediaplayer"
+                type="checkbox">
+            <span i18n-content="mediaplayer"></span>
+          </label>
+        </td>
+      </tr>
+      </table>
     </div>
   </section>
   <section>
     <h3 i18n-content="advanced_file_title"></h3>
     <div class="option">
-       <table class="option-control-table">
-       <tr>
-         <td class="option-name"><label><input id="advanced-filesystem-check"
-              pref="settings.labs.advanced_filesystem" type="checkbox"><span
-              i18n-content="advanced_filesystem"></span></label></td>
+      <table class="option-control-table">
+      <tr>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="advanced-filesystem-check"
+                pref="settings.labs.advanced_filesystem" type="checkbox">
+            <span i18n-content="advanced_filesystem"></span>
+          </label>
+        </td>
        </tr>
        </table>
     </div>
@@ -27,14 +35,18 @@
   <section>
     <h3 i18n-content="talk_title"></h3>
     <div class="option">
-       <table class="option-control-table">
-       <tr>
-       <td class="option-name"><label><input id="talk-check"
-            pref="extensions.settings.ggnioahjipcehijkhpdjekioddnjoben.state"
-            type="checkbox" value-type="number"><span
-            i18n-content="talk"></span></label></td>
-       </tr>
-       </table>
+      <table class="option-control-table">
+      <tr>
+      <td class="option-name">
+        <label class="checkbox">
+          <input id="talk-check"
+              pref="extensions.settings.ggnioahjipcehijkhpdjekioddnjoben.state"
+              type="checkbox" value-type="number">
+          <span i18n-content="talk"></span>
+        </label>
+      </td>
+      </tr>
+      </table>
     </div>
   </section>
   <section>
diff --git a/chrome/browser/resources/options/chromeos_language_chewing_options.html b/chrome/browser/resources/options/chromeos_language_chewing_options.html
index 102c7c4..e71838b 100644
--- a/chrome/browser/resources/options/chromeos_language_chewing_options.html
+++ b/chrome/browser/resources/options/chromeos_language_chewing_options.html
@@ -3,76 +3,92 @@
   <section>
     <table class="option-control-table">
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-auto-shift-cur"
-              pref="settings.language.chewing_auto_shift_cur"
-              type="checkbox">
-           <span i18n-content="Chewing_autoShiftCur"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-auto-shift-cur"
+                pref="settings.language.chewing_auto_shift_cur" type="checkbox">
+            <span i18n-content="Chewing_autoShiftCur"></span>
+          </label>
          </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-add-phrase-direction"
-              pref="settings.language.chewing_add_phrase_direction"
-              type="checkbox">
-           <span i18n-content="Chewing_addPhraseDirection"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-add-phrase-direction"
+                pref="settings.language.chewing_add_phrase_direction"
+                type="checkbox">
+            <span i18n-content="Chewing_addPhraseDirection"></span>
+          </label>
          </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-easy-symbol-input"
-              pref="settings.language.chewing_easy_symbol_input"
-              type="checkbox">
-           <span i18n-content="Chewing_easySymbolInput"></span></label></td>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-easy-symbol-input"
+                pref="settings.language.chewing_easy_symbol_input"
+                type="checkbox">
+            <span i18n-content="Chewing_easySymbolInput"></span>
+          </label>
+         </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-esc-clean-all-buf"
-              pref="settings.language.chewing_esc_clean_all_buf"
-              type="checkbox">
-           <span i18n-content="Chewing_escCleanAllBuf"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-esc-clean-all-buf"
+                pref="settings.language.chewing_esc_clean_all_buf"
+                type="checkbox">
+           <span i18n-content="Chewing_escCleanAllBuf"></span>
+          </label>
          </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-force-lowercase-english"
-              pref="settings.language.chewing_force_lowercase_english"
-              type="checkbox">
-           <span i18n-content="Chewing_forceLowercaseEnglish"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-force-lowercase-english"
+                pref="settings.language.chewing_force_lowercase_english"
+                type="checkbox">
+           <span i18n-content="Chewing_forceLowercaseEnglish"></span>
+          </label>
          </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-plain-zhuyin"
-              pref="settings.language.chewing_plain_zhuyin"
-              type="checkbox">
-           <span i18n-content="Chewing_plainZhuyin"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-plain-zhuyin"
+                pref="settings.language.chewing_plain_zhuyin"
+                type="checkbox">
+           <span i18n-content="Chewing_plainZhuyin"></span>
+          </label>
          </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-phrase-choice-rearward"
-              pref="settings.language.chewing_phrase_choice_rearward"
-              type="checkbox">
-           <span i18n-content="Chewing_phraseChoiceRearward"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-phrase-choice-rearward"
+                pref="settings.language.chewing_phrase_choice_rearward"
+                type="checkbox">
+           <span i18n-content="Chewing_phraseChoiceRearward"></span>
+          </label>
          </td>
        </tr>
        <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="chewing-space-as-selection"
-              pref="settings.language.chewing_space_as_selection"
-              type="checkbox">
-           <span i18n-content="Chewing_spaceAsSelection"></span></label>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="chewing-space-as-selection"
+                pref="settings.language.chewing_space_as_selection"
+                type="checkbox">
+           <span i18n-content="Chewing_spaceAsSelection"></span>
+          </label>
          </td>
        </tr>
        <tr>
          <td class="option-name" i18n-content="Chewing_maxChiSymbolLen"></td>
          <td class="option-value">
            <input id="chewing-max-chi-symbol-len" class="control"
-                pref="settings.language.chewing_max_chi_symbol_len"
-                i18n-values="min:Chewing_maxChiSymbolLenMin;
-                             max:Chewing_maxChiSymbolLenMax"
-                type="range">
+              pref="settings.language.chewing_max_chi_symbol_len"
+              i18n-values="min:Chewing_maxChiSymbolLenMin;
+                           max:Chewing_maxChiSymbolLenMax"
+              type="range">
            <span id="chewing-max-chi-symbol-len-value"></span>
          </td>
        </tr>
diff --git a/chrome/browser/resources/options/chromeos_language_mozc_options.html b/chrome/browser/resources/options/chromeos_language_mozc_options.html
index ba8ecc6..77a6898 100644
--- a/chrome/browser/resources/options/chromeos_language_mozc_options.html
+++ b/chrome/browser/resources/options/chromeos_language_mozc_options.html
@@ -2,77 +2,92 @@
   <h1 i18n-content="languageMozcPage"></h1>
   <section>
     <table class="option-control-table">
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-incognito-mode"
-              pref="settings.language.mozc_incognito_mode"
-              type="checkbox">
-           <span i18n-content="mozc_incognito_mode"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-auto-ime-turn-off"
-              pref="settings.language.mozc_use_auto_ime_turn_off"
-              type="checkbox">
-           <span i18n-content="mozc_use_auto_ime_turn_off"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-date-conversion"
-              pref="settings.language.mozc_use_date_conversion"
-              type="checkbox">
-           <span i18n-content="mozc_use_date_conversion"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-single-kanji-conversion"
-              pref="settings.language.mozc_use_single_kanji_conversion"
-              type="checkbox">
-           <span i18n-content="mozc_use_single_kanji_conversion"></span>
-           </label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-symbol-conversion"
-              pref="settings.language.mozc_use_symbol_conversion"
-              type="checkbox">
-           <span i18n-content="mozc_use_symbol_conversion"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-number-conversion"
-              pref="settings.language.mozc_use_number_conversion"
-              type="checkbox">
-           <span i18n-content="mozc_use_number_conversion"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-history-suggest"
-              pref="settings.language.mozc_use_history_suggest"
-              type="checkbox">
-           <span i18n-content="mozc_use_history_suggest"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="mozc-use-dictionary-suggest"
-              pref="settings.language.mozc_use_dictionary_suggest"
-              type="checkbox">
-           <span i18n-content="mozc_use_dictionary_suggest"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" i18n-content="mozc_preedit_method"></td>
-         <td class="option-value">
-           <select id="mozc-preedit-method" class="control"
-                pref="settings.language.mozc_preedit_method"
-                data-values="mozc_preedit_methodValue"></select>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="mozc-incognito-mode"
+                pref="settings.language.mozc_incognito_mode"
+                type="checkbox">
+            <span i18n-content="mozc_incognito_mode"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+         <label class="checkbox">
+           <input id="mozc-use-auto-ime-turn-off"
+                pref="settings.language.mozc_use_auto_ime_turn_off"
+                type="checkbox">
+            <span i18n-content="mozc_use_auto_ime_turn_off"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="mozc-use-date-conversion"
+                pref="settings.language.mozc_use_date_conversion"
+                type="checkbox">
+            <span i18n-content="mozc_use_date_conversion"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="mozc-use-single-kanji-conversion"
+                pref="settings.language.mozc_use_single_kanji_conversion"
+                type="checkbox">
+            <span i18n-content="mozc_use_single_kanji_conversion"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input  id="mozc-use-symbol-conversion"
+                pref="settings.language.mozc_use_symbol_conversion"
+                type="checkbox">
+            <span i18n-content="mozc_use_symbol_conversion"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="mozc-use-number-conversion"
+                pref="settings.language.mozc_use_number_conversion"
+                type="checkbox">
+            <span i18n-content="mozc_use_number_conversion"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="mozc-use-history-suggest"
+                pref="settings.language.mozc_use_history_suggest"
+                type="checkbox">
+            <span i18n-content="mozc_use_history_suggest"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="mozc-use-dictionary-suggest"
+                pref="settings.language.mozc_use_dictionary_suggest"
+                type="checkbox">
+            <span i18n-content="mozc_use_dictionary_suggest"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" i18n-content="mozc_preedit_method"></td>
+        <td class="option-value">
+          <select id="mozc-preedit-method" class="control"
+              pref="settings.language.mozc_preedit_method"
+              data-values="mozc_preedit_methodValue"></select>
          </td>
        </tr>
        <tr>
diff --git a/chrome/browser/resources/options/chromeos_language_pinyin_options.html b/chrome/browser/resources/options/chromeos_language_pinyin_options.html
index 2b788ce..e2cd757 100644
--- a/chrome/browser/resources/options/chromeos_language_pinyin_options.html
+++ b/chrome/browser/resources/options/chromeos_language_pinyin_options.html
@@ -2,102 +2,125 @@
   <h1 i18n-content="languagePinyinPage"></h1>
   <section>
     <table class="option-control-table">
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-correct-pinyin"
-              pref="settings.language.pinyin_correct_pinyin"
-              type="checkbox">
-           <span i18n-content="PinyinCorrectPinyin"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-fuzzy-pinyin"
-              pref="settings.language.pinyin_fuzzy_pinyin"
-              type="checkbox">
-           <span i18n-content="PinyinFuzzyPinyin"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-correct-pinyin"
+                pref="settings.language.pinyin_correct_pinyin"
+                type="checkbox">
+            <span i18n-content="PinyinCorrectPinyin"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-fuzzy-pinyin"
+                pref="settings.language.pinyin_fuzzy_pinyin"
+                type="checkbox">
+            <span i18n-content="PinyinFuzzyPinyin"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input
               id="pinyin-shift-select-candidate"
               pref="settings.language.pinyin_shift_select_candidate"
               type="checkbox">
-           <span i18n-content="PinyinShiftSelectCandidate"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-minus-equal-page"
-              pref="settings.language.pinyin_minus_equal_page"
-              type="checkbox">
-           <span i18n-content="PinyinMinusEqualPage"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-comma-period-page"
-              pref="settings.language.pinyin_comma_period_page"
-              type="checkbox">
-           <span i18n-content="PinyinCommaPeriodPage"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-auto-commit"
-              pref="settings.language.pinyin_auto_commit"
-              type="checkbox">
-           <span i18n-content="PinyinAutoCommit"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-double-pinyin"
-              pref="settings.language.pinyin_double_pinyin"
-              type="checkbox">
-           <span i18n-content="PinyinDoublePinyin"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-init-chinese"
-              pref="settings.language.pinyin_init_chinese"
-              type="checkbox">
-           <span i18n-content="PinyinInitChinese"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-init-full"
-              pref="settings.language.pinyin_init_full"
-              type="checkbox">
-           <span i18n-content="PinyinInitFull"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-init-full-punct"
-              pref="settings.language.pinyin_init_full_punct"
-              type="checkbox">
-           <span i18n-content="PinyinInitFullPunct"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="pinyin-init-simplified-chinese"
-              pref="settings.language.pinyin_init_simplified_chinese"
-              type="checkbox">
-           <span i18n-content="PinyinInitSimplifiedChinese"></span></label>
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" i18n-content="PinyinDoublePinyinSchema"></td>
-         <td class="option-value">
-           <select id="pinyin-double-pinyin-schema" class="control"
-                pref="settings.language.pinyin_double_pinyin_schema"
-                data-values="PinyinDoublePinyinSchemaValue"></select>
-         </td>
-       </tr>
-     </table>
+            <span i18n-content="PinyinShiftSelectCandidate"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-minus-equal-page"
+                pref="settings.language.pinyin_minus_equal_page"
+                type="checkbox">
+            <span i18n-content="PinyinMinusEqualPage"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-comma-period-page"
+                pref="settings.language.pinyin_comma_period_page"
+                type="checkbox">
+            <span i18n-content="PinyinCommaPeriodPage"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-auto-commit"
+                pref="settings.language.pinyin_auto_commit"
+                type="checkbox">
+            <span i18n-content="PinyinAutoCommit"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-double-pinyin"
+                pref="settings.language.pinyin_double_pinyin"
+                type="checkbox">
+            <span i18n-content="PinyinDoublePinyin"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+         <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-init-chinese"
+                pref="settings.language.pinyin_init_chinese"
+                type="checkbox">
+            <span i18n-content="PinyinInitChinese"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-init-full"
+                pref="settings.language.pinyin_init_full"
+                type="checkbox">
+            <span i18n-content="PinyinInitFull"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-init-full-punct"
+                pref="settings.language.pinyin_init_full_punct"
+                type="checkbox">
+            <span i18n-content="PinyinInitFullPunct"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="pinyin-init-simplified-chinese"
+                pref="settings.language.pinyin_init_simplified_chinese"
+                type="checkbox">
+            <span i18n-content="PinyinInitSimplifiedChinese"></span>
+          </label>
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" i18n-content="PinyinDoublePinyinSchema"></td>
+        <td class="option-value">
+          <select id="pinyin-double-pinyin-schema" class="control"
+              pref="settings.language.pinyin_double_pinyin_schema"
+              data-values="PinyinDoublePinyinSchemaValue"></select>
+        </td>
+      </tr>
+    </table>
   </section>
 </div>
diff --git a/chrome/browser/resources/options/chromeos_proxy.html b/chrome/browser/resources/options/chromeos_proxy.html
index 4c0afba..3fb1300 100644
--- a/chrome/browser/resources/options/chromeos_proxy.html
+++ b/chrome/browser/resources/options/chromeos_proxy.html
@@ -3,16 +3,20 @@
   <section>
     <h3 i18n-content="proxy_config_title"></h3>
     <div>
-      <label><input type="radio" id="directProxy" name="proxytype" 
-          pref="cros.proxy.type" value="1"><span
-          i18n-content="proxyDirectInternetConnection"></span>
+      <label class="radio">
+        <input type="radio" id="directProxy" name="proxytype"
+          pref="cros.proxy.type" value="1">
+        <span i18n-content="proxyDirectInternetConnection"></span>
+      </label>
+      <label class="radio">
+        <input type="radio" id="manualProxy" name="proxytype"
+            pref="cros.proxy.type" value="2">
+        <span i18n-content="proxyManual"></span>
+      </label>
+      <label class="checkbox">
+        <input id="proxyAllProtocols" type="checkbox" pref="cros.proxy.single">
+        <span i18n-content="sameProxyProtocols"></span>
       </label>
-      <label><input type="radio" id="manualProxy" name="proxytype"
-          pref="cros.proxy.type" value="2"><span
-          i18n-content="proxyManual"></span></label>
-      <label><input id="proxyAllProtocols"
-          type="checkbox" pref="cros.proxy.single"><span
-          i18n-content="sameProxyProtocols"></span></label>
       <div id="singleProxy">
         <table>
         <tr><td><span
@@ -45,7 +49,7 @@
           i18n-content="proxyPort"></span></td><td>
         <input id="secureProxyPort" type="text" size="5" pref="cros.proxy.httpsport" disabled>
         </td></tr>
-        <tr>    
+        <tr>
         <td><span
             i18n-content="ftpProxy"></span></td><td>
           <input id="ftpProxy" type="text" size="30" pref="cros.proxy.ftpurl" disabled>
@@ -65,9 +69,10 @@
         </td></tr>
         </table>
       </div>
-      <label><input type="radio" id="autoProxy" name="proxytype"
-            pref="cros.proxy.type" value="3"><span
-          i18n-content="proxyAutomatic"></span></label>
+      <label class="radio">
+        <input type="radio" id="autoProxy" name="proxytype"
+            pref="cros.proxy.type" value="3">
+        <span i18n-content="proxyAutomatic"></span></label>
       <label><span
           i18n-content="proxyConfigUrl"></span>
         <input id="proxyConfig" type="url" size="60" pref="cros.proxy.pacurl">
diff --git a/chrome/browser/resources/options/chromeos_system_options.html b/chrome/browser/resources/options/chromeos_system_options.html
index a8fe151..0035341 100644
--- a/chrome/browser/resources/options/chromeos_system_options.html
+++ b/chrome/browser/resources/options/chromeos_system_options.html
@@ -15,20 +15,24 @@
   <section>
     <h3 i18n-content="touchpad"></h3>
     <table class="option-control-table">
-       <tr>
-         <td class="option-name" i18n-content="sensitivity"></td>
-         <td class="option-value">
-           <input id="sensitivity-range" type="range" min="1" max="5"
-               pref="settings.touchpad.sensitivity2" class="touch-slider">
-         </td>
-       </tr>
-       <tr>
-         <td class="option-name" colspan="2"><label><input
-              id="tap-to-click-check"
-              pref="settings.touchpad.enable_tap_to_click"
-              type="checkbox"><span i18n-content="enable_tap_to_click"></span></label></td>
-       </tr>
-     </table>
+      <tr>
+        <td class="option-name" i18n-content="sensitivity"></td>
+        <td class="option-value">
+          <input id="sensitivity-range" type="range" min="1" max="5"
+              pref="settings.touchpad.sensitivity2" class="touch-slider">
+        </td>
+      </tr>
+      <tr>
+        <td class="option-name" colspan="2">
+          <label class="checkbox">
+            <input id="tap-to-click-check"
+                pref="settings.touchpad.enable_tap_to_click"
+                type="checkbox">
+            <span i18n-content="enable_tap_to_click"></span>
+          </label>
+        </td>
+      </tr>
+    </table>
   </section>
   <section>
     <h3 i18n-content="language"></h3>
@@ -47,9 +51,13 @@
     <h3 i18n-content="accessibility_title"></h3>
     <table class="option-control-table">
       <tr>
-        <td class="option-name"><label><input id="accesibility-check"
-            pref="settings.accessibility" type="checkbox"><span
-            i18n-content="accessibility"></span></label></td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="accesibility-check"
+                pref="settings.accessibility" type="checkbox">
+            <span i18n-content="accessibility"></span>
+          </label>
+        </td>
       </tr>
     </table>
   </section>
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html
index 7c628e6..cd90f39 100644
--- a/chrome/browser/resources/options/content_settings.html
+++ b/chrome/browser/resources/options/content_settings.html
@@ -18,7 +18,7 @@
           i18n-content="popups_tab_label" id="popups-nav-tab"
           class="inactive-tab" tab-contents="popupsFilterTab"></span><span
           i18n-content="location_tab_label" id="location-nav-tab"
-          class="inactive-tab" tab-contents="locationFilterTab"></span><span 
+          class="inactive-tab" tab-contents="locationFilterTab"></span><span
           i18n-content="notifications_tab_label" id="notifications-nav-tab"
           class="inactive-tab" tab-contents="notificationsFilterTab"></span>
   </div>
@@ -29,16 +29,20 @@
     <h4 i18n-content="cookies_modify" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="cookies" value="allow">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="cookies" value="allow">
           <span i18n-content="cookies_allow"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="cookies" value="block">
-         <span i18n-content="cookies_block"></span>
-      </label></td>
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="cookies" value="block">
+           <span i18n-content="cookies_block"></span>
+        </label>
+      </td>
     </tr>
     </table>
 
@@ -53,17 +57,21 @@
 
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input id="block-third-party-cookies" type="checkbox">
+      <td class="option-name">
+        <label class="checkbox">
+          <input id="block-third-party-cookies" type="checkbox">
           <span i18n-content="cookies_block_3rd_party"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-         <input id="clear-cookies-on-exit"
-                pref="profile.clear_site_data_on_exit" type="checkbox">
-           <span i18n-content="cookies_clear_on_exit"></span>
-       </label></td>
+      <td class="option-name">
+        <label class="checkbox">
+          <input id="clear-cookies-on-exit"
+              pref="profile.clear_site_data_on_exit" type="checkbox">
+          <span i18n-content="cookies_clear_on_exit"></span>
+        </label>
+      </td>
     </tr>
     <tr>
       <td class="option-name"><button id="show-cookies-button"
@@ -84,16 +92,20 @@
     <h4 i18n-content="images_setting" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="images" value="allow">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="images" value="allow">
           <span i18n-content="images_allow"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="images" value="block">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="images" value="block">
           <span i18n-content="images_block"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     </table>
 
@@ -112,16 +124,20 @@
     <h4 i18n-content="javascript_setting" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="javascript" value="allow">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="javascript" value="allow">
           <span i18n-content="javascript_allow"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="javascript" value="block">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="javascript" value="block">
           <span i18n-content="javascript_block"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     </table>
 
@@ -140,22 +156,28 @@
     <h4 i18n-content="plugins_setting" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="plugins" value="allow">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="plugins" value="allow">
           <span i18n-content="plugins_allow"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="plugins" value="ask">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="plugins" value="ask">
           <span i18n-content="plugins_allow_sandboxed"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="plugins" value="block">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="plugins" value="block">
           <span i18n-content="plugins_block"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     </table>
 
@@ -175,16 +197,20 @@
     <h4 i18n-content="popups_setting" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-       <td class="option-name"><label>
-         <input type="radio" name="popups" value="allow">
+       <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="popups" value="allow">
            <span i18n-content="popups_allow"></span>
-       </label></td>
+        </label>
+       </td>
     </tr>
     <tr>
-       <td class="option-name"><label>
-         <input type="radio" name="popups" value="block">
-           <span i18n-content="popups_block"></span>
-       </label></td>
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="popups" value="block">
+          <span i18n-content="popups_block"></span>
+        </label>
+      </td>
     </tr>
     </table>
 
@@ -203,22 +229,28 @@
     <h4 i18n-content="location_setting" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="location" value="allow">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="location" value="allow">
           <span i18n-content="location_allow"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="location" value="ask">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="location" value="ask">
           <span i18n-content="location_ask"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="location" value="block">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="location" value="block">
           <span i18n-content="location_block"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     </table>
 
@@ -233,22 +265,28 @@
     <h4 i18n-content="notifications_setting" class="contentSettingsHeader"></h4>
     <table class="option-control-table">
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="notifications" value="allow">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="notifications" value="allow">
           <span i18n-content="notifications_allow"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="notifications" value="ask">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="notifications" value="ask">
           <span i18n-content="notifications_ask"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     <tr>
-      <td class="option-name"><label>
-        <input type="radio" name="notifications" value="block">
+      <td class="option-name">
+        <label class="radio">
+          <input type="radio" name="notifications" value="block">
           <span i18n-content="notifications_block"></span>
-      </label></td>
+        </label>
+      </td>
     </tr>
     </table>
 
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 847a3f9..a1944c5 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -1,6 +1,7 @@
 body {
-  font-size: 100%;
   -webkit-user-select: none;
+  cursor: default;
+  font-size: 100%;
 }
 
 #settings-title {
@@ -72,6 +73,7 @@ html[dir='rtl'] #close-overlay {
 }
 
 #navbar-container {
+  -webkit-border-end: 1px solid #c6c9ce;
   background: -webkit-gradient(linear,
                                left top,
                                left bottom,
@@ -83,9 +85,11 @@ html[dir='rtl'] #close-overlay {
                                from(#eaeef3),
                                color-stop(0.97, #eaeef3),
                                to(#d3d7db));
-  -webkit-border-end: 1px solid #c6c9ce;
+  bottom: 0;
   cursor: pointer;
-  position: relative;
+  left: 0;
+  position: fixed;
+  top: 0;
   width: 250px;
   z-index: 2;
   display: none;
@@ -104,6 +108,8 @@ html[dir='rtl'] #navbar-container {
                                from(white),
                                color-stop(0.8, white),
                                to(#f3f3f3));
+  left: auto;
+  right: 0;
 }
 
 html[hide-menu=false] #navbar-container {
@@ -182,7 +188,7 @@ html[hide-menu=true] #mainview {
   width: 100%;
 }
 
-#managed-prefs-banner, span {
+#managed-prefs-banner {
   margin: 0;
   padding: 0;
   vertical-align: middle;
@@ -250,7 +256,7 @@ section > div:only-of-type {
  */
 section > div:only-of-type label {
   display: block;
-  margin-bottom: 3px;
+  margin: 3px 0;
 }
 
 .hidden {
@@ -261,16 +267,6 @@ section > div:only-of-type label {
   -webkit-appearance: slider-horizontal;
 }
 
-input[type="checkbox"] {
-  margin-top: 0;
-  vertical-align: middle;
-}
-
-input[type="radio"] {
-  vertical-align: top;
-  padding-top: 2px;
-}
-
 select {
   margin: 0px;
 }
@@ -330,11 +326,15 @@ html[enable-background-mode=false] #background-mode-section {
  display: none;
 }
 
-.multi-line-wrap input {
+label.checkbox > input,
+label.radio > input {
+  margin-top: 2px; /* TODO(arv): This was tested on Mac, add platform specific
+                      tweaks here */
   position: absolute;
 }
 
-.multi-line-wrap span {
-  -webkit-margin-start: 20px;
+label.checkbox > span,
+label.radio > span {
+  -webkit-margin-start: 19px;
   display: block;
 }
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 07e52c9..53e850e 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -29,14 +29,14 @@
   <section>
     <h3 i18n-content="passwords"></h3>
     <div>
-      <label>
+      <label class="radio">
         <input id="passwords_asktosave"
             name="passwords_radio"
             pref="profile.password_manager_enabled"
             type="radio" value="true" metric="Options_PasswordManager">
         <span i18n-content="passwords_asktosave"></span>
       </label>
-      <label>
+      <label class="radio">
         <input id="passwords_neversave"
             name="passwords_radio"
             pref="profile.password_manager_enabled"
@@ -72,13 +72,13 @@
             i18n-content="themes_set_classic"></button>
         <a i18n-content="themes_gallery" id="themes-gallery" href="#"></a>
       </div>
-      <label>
+      <label class="radio">
         <input name="decorations_radio"
             pref="browser.custom_chrome_frame"
             type="radio" value="false" metric="Options_CustomFrame">
         <span i18n-content="showWindow_decorations_radio"></span>
       </label>
-      <label>
+      <label class="radio">
         <input name="decorations_radio"
             pref="browser.custom_chrome_frame"
             type="radio" value="true" metric="Options_CustomFrame">
diff --git a/chrome/browser/resources/options/sync_options.html b/chrome/browser/resources/options/sync_options.html
index a503d78..e377355 100644
--- a/chrome/browser/resources/options/sync_options.html
+++ b/chrome/browser/resources/options/sync_options.html
@@ -4,36 +4,60 @@
     <h3 i18n-content="sync_title"></h3>
     <table class="option-control-table">
       <tr>
-        <td class="option-name"><label><input id="settings-check"
-            pref="sync.preferences" type="checkbox"><span
-            i18n-content="syncsettings"></span></label></td>
-        <td class="option-name"><label><input id="bookmarks-check"
-            pref="sync.bookmarks" type="checkbox"><span
-            i18n-content="syncbookmarks"></span></label></td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="settings-check" pref="sync.preferences" type="checkbox">
+            <span i18n-content="syncsettings"></span>
+          </label>
+        </td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="bookmarks-check" pref="sync.bookmarks" type="checkbox">
+            <span i18n-content="syncbookmarks"></span>
+          </label>
+        </td>
       </tr>
       <tr>
-        <td class="option-name"><label><input id="extensions-check"
-            pref="sync.extensions" type="checkbox"><span
-            i18n-content="syncextensions"></span></label></td>
-        <td class="option-name"><label><input id="autofill-check"
-            pref="sync.autofill" type="checkbox"><span
-            i18n-content="syncautofill"></span></label></td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="extensions-check" pref="sync.extensions" type="checkbox">
+            <span i18n-content="syncextensions"></span>
+          </label>
+        </td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="autofill-check" pref="sync.autofill" type="checkbox">
+            <span i18n-content="syncautofill"></span>
+          </label>
+        </td>
       </tr>
       <tr>
-        <td class="option-name"><label><input id="themes-check"
-            pref="sync.themes" type="checkbox"><span
-            i18n-content="syncthemes"></span></label></td>
-        <td class="option-name"><label><input id="apps-check"
-            pref="sync.apps" type="checkbox"><span
-            i18n-content="syncapps"></span><label></td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="themes-check" pref="sync.themes" type="checkbox">
+            <span i18n-content="syncthemes"></span>
+          </label>
+        </td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="apps-check" pref="sync.apps" type="checkbox">
+            <span i18n-content="syncapps"></span>
+          <label>
+        </td>
       </tr>
       <tr>
-        <td class="option-name"><label><input id="typedurls-check"
-            pref="sync.typed_urls" type="checkbox"><span
-            i18n-content="synctypedurls"></span></label></td>
-        <td class="option-name"><label><input id="passwords-check"
-            pref="sync.passwords" type="checkbox"><span
-            i18n-content="syncpasswords"></span></label></td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="typedurls-check" pref="sync.typed_urls" type="checkbox">
+            <span i18n-content="synctypedurls"></span>
+          </label>
+        </td>
+        <td class="option-name">
+          <label class="checkbox">
+            <input id="passwords-check" pref="sync.passwords" type="checkbox">
+            <span i18n-content="syncpasswords"></span>
+          </label>
+        </td>
       </tr>
     </table>
   </section>