diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2076,7 +2076,6 @@
     'PhabricatorAccessLog' => 'infrastructure/log/PhabricatorAccessLog.php',
     'PhabricatorAccessLogConfigOptions' => 'applications/config/option/PhabricatorAccessLogConfigOptions.php',
     'PhabricatorAccessibilitySetting' => 'applications/settings/setting/PhabricatorAccessibilitySetting.php',
-    'PhabricatorAccountSettingsPanel' => 'applications/settings/panel/PhabricatorAccountSettingsPanel.php',
     'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php',
     'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php',
     'PhabricatorActivitySettingsPanel' => 'applications/settings/panel/PhabricatorActivitySettingsPanel.php',
@@ -3362,6 +3361,7 @@
     'PhabricatorKeyringConfigOptionType' => 'applications/files/keyring/PhabricatorKeyringConfigOptionType.php',
     'PhabricatorLDAPAuthProvider' => 'applications/auth/provider/PhabricatorLDAPAuthProvider.php',
     'PhabricatorLabelProfileMenuItem' => 'applications/search/menuitem/PhabricatorLabelProfileMenuItem.php',
+    'PhabricatorLanguageSettingsPanel' => 'applications/settings/panel/PhabricatorLanguageSettingsPanel.php',
     'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php',
     'PhabricatorLegalpadDocumentPHIDType' => 'applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php',
     'PhabricatorLegalpadSignaturePolicyRule' => 'applications/legalpad/policyrule/PhabricatorLegalpadSignaturePolicyRule.php',
@@ -7756,7 +7756,6 @@
     'PhabricatorAccessLog' => 'Phobject',
     'PhabricatorAccessLogConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorAccessibilitySetting' => 'PhabricatorSelectSetting',
-    'PhabricatorAccountSettingsPanel' => 'PhabricatorEditEngineSettingsPanel',
     'PhabricatorActionListView' => 'AphrontTagView',
     'PhabricatorActionView' => 'AphrontView',
     'PhabricatorActivitySettingsPanel' => 'PhabricatorSettingsPanel',
@@ -9244,6 +9243,7 @@
     'PhabricatorKeyringConfigOptionType' => 'PhabricatorConfigJSONOptionType',
     'PhabricatorLDAPAuthProvider' => 'PhabricatorAuthProvider',
     'PhabricatorLabelProfileMenuItem' => 'PhabricatorProfileMenuItem',
+    'PhabricatorLanguageSettingsPanel' => 'PhabricatorEditEngineSettingsPanel',
     'PhabricatorLegalpadApplication' => 'PhabricatorApplication',
     'PhabricatorLegalpadDocumentPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorLegalpadSignaturePolicyRule' => 'PhabricatorPolicyRule',
diff --git a/src/applications/settings/controller/PhabricatorSettingsMainController.php b/src/applications/settings/controller/PhabricatorSettingsMainController.php
--- a/src/applications/settings/controller/PhabricatorSettingsMainController.php
+++ b/src/applications/settings/controller/PhabricatorSettingsMainController.php
@@ -115,7 +115,7 @@
     $crumbs->setBorder(true);
 
     if ($this->user) {
-      $header_text = pht('Edit Settings (%s)', $user->getUserName());
+      $header_text = pht('Edit Settings: %s', $user->getUserName());
     } else {
       $header_text = pht('Edit Global Settings');
     }
@@ -127,15 +127,13 @@
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
-      ->setFixed(true)
-      ->setNavigation($nav)
-      ->setMainColumn($response);
+      ->setFooter($response);
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
+      ->setNavigation($nav)
       ->appendChild($view);
-
   }
 
   private function buildPanels(PhabricatorUserPreferences $preferences) {
diff --git a/src/applications/settings/editor/PhabricatorSettingsEditEngine.php b/src/applications/settings/editor/PhabricatorSettingsEditEngine.php
--- a/src/applications/settings/editor/PhabricatorSettingsEditEngine.php
+++ b/src/applications/settings/editor/PhabricatorSettingsEditEngine.php
@@ -101,7 +101,7 @@
   protected function getPageHeader($object) {
     $user = $object->getUser();
     if ($user) {
-      $text = pht('Edit Settings (%s)', $user->getUserName());
+      $text = pht('Edit Settings: %s', $user->getUserName());
     } else {
       $text = pht('Edit Global Settings');
     }
diff --git a/src/applications/settings/panel/PhabricatorAccountSettingsPanel.php b/src/applications/settings/panel/PhabricatorLanguageSettingsPanel.php
rename from src/applications/settings/panel/PhabricatorAccountSettingsPanel.php
rename to src/applications/settings/panel/PhabricatorLanguageSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorAccountSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorLanguageSettingsPanel.php
@@ -1,12 +1,12 @@
 <?php
 
-final class PhabricatorAccountSettingsPanel
+final class PhabricatorLanguageSettingsPanel
   extends PhabricatorEditEngineSettingsPanel {
 
-  const PANELKEY = 'account';
+  const PANELKEY = 'language';
 
   public function getPanelName() {
-    return pht('Account');
+    return pht('Language');
   }
 
   public function getPanelGroupKey() {
diff --git a/src/applications/settings/panelgroup/PhabricatorSettingsAccountPanelGroup.php b/src/applications/settings/panelgroup/PhabricatorSettingsAccountPanelGroup.php
--- a/src/applications/settings/panelgroup/PhabricatorSettingsAccountPanelGroup.php
+++ b/src/applications/settings/panelgroup/PhabricatorSettingsAccountPanelGroup.php
@@ -6,7 +6,7 @@
   const PANELGROUPKEY = 'account';
 
   public function getPanelGroupName() {
-    return null;
+    return pht('Account');
   }
 
   protected function getPanelGroupOrder() {
diff --git a/src/applications/settings/setting/PhabricatorPronounSetting.php b/src/applications/settings/setting/PhabricatorPronounSetting.php
--- a/src/applications/settings/setting/PhabricatorPronounSetting.php
+++ b/src/applications/settings/setting/PhabricatorPronounSetting.php
@@ -10,7 +10,7 @@
   }
 
   public function getSettingPanelKey() {
-    return PhabricatorAccountSettingsPanel::PANELKEY;
+    return PhabricatorLanguageSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
diff --git a/src/applications/settings/setting/PhabricatorTranslationSetting.php b/src/applications/settings/setting/PhabricatorTranslationSetting.php
--- a/src/applications/settings/setting/PhabricatorTranslationSetting.php
+++ b/src/applications/settings/setting/PhabricatorTranslationSetting.php
@@ -10,7 +10,7 @@
   }
 
   public function getSettingPanelKey() {
-    return PhabricatorAccountSettingsPanel::PANELKEY;
+    return PhabricatorLanguageSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1249,6 +1249,8 @@
       $view->setHeader($page_header);
     }
 
+    $view->setFooter($content);
+
     $page = $controller->newPage()
       ->setTitle($header_text)
       ->setCrumbs($crumbs)
@@ -1256,11 +1258,7 @@
 
     $navigation = $this->getNavigation();
     if ($navigation) {
-      $view->setFixed(true);
-      $view->setNavigation($navigation);
-      $view->setMainColumn($content);
-    } else {
-      $view->setFooter($content);
+      $page->setNavigation($navigation);
     }
 
     return $page;