diff --git a/themes/bartik/css/colors.css b/themes/bartik/css/colors.css
index 328ae1a5936..d6129606871 100644
--- a/themes/bartik/css/colors.css
+++ b/themes/bartik/css/colors.css
@@ -48,8 +48,8 @@ a:active {
 .region-header,
 .region-header a,
 .region-header li a.active,
-#header #name-and-slogan,
-#header #name-and-slogan a,
+#name-and-slogan,
+#name-and-slogan a,
 #secondary-menu-links li a {
   color: #fffeff;
 }
diff --git a/themes/bartik/css/maintenance-page.css b/themes/bartik/css/maintenance-page.css
index 5d98c4695b9..d7e196b34bd 100644
--- a/themes/bartik/css/maintenance-page.css
+++ b/themes/bartik/css/maintenance-page.css
@@ -7,8 +7,9 @@ body.maintenance-page {
 .maintenance-page #page-wrapper {
   margin-left: auto;
   margin-right: auto;
+  min-width: 0;
   width: 800px;
-  border: 1px solid #cbcbcb;
+  border: 1px solid #ddd;
   margin-top: 40px;
 }
 .maintenance-page #page {
diff --git a/themes/bartik/template.php b/themes/bartik/template.php
index 9e010d300cc..e94782527f3 100644
--- a/themes/bartik/template.php
+++ b/themes/bartik/template.php
@@ -78,6 +78,9 @@ function bartik_process_page(&$variables) {
  * Implements hook_preprocess_maintenance_page().
  */
 function bartik_preprocess_maintenance_page(&$variables) {
+  if (!$variables['db_is_active']) {
+    unset($variables['site_name']);
+  }
   drupal_add_css(drupal_get_path('theme', 'bartik') . '/css/maintenance-page.css');
 }
 
diff --git a/themes/bartik/templates/maintenance-page.tpl.php b/themes/bartik/templates/maintenance-page.tpl.php
index 5ba63def192..7dacde4627c 100644
--- a/themes/bartik/templates/maintenance-page.tpl.php
+++ b/themes/bartik/templates/maintenance-page.tpl.php
@@ -25,7 +25,7 @@
 </head>
 <body class="<?php print $classes; ?>" <?php print $attributes;?>>
   <div id="skip-link">
-    <a href="#main-content"><?php print t('Skip to main content'); ?></a>
+    <a href="#main-content" class="element-invisible element-focusable"><?php print t('Skip to main content'); ?></a>
   </div>
   <?php print $page_top; ?>
 
@@ -66,7 +66,6 @@
   <div id="main-wrapper"><div id="main" class="clearfix">
 
     <div id="content" class="column"><div class="section">
-      <?php if ($highlighted): ?><div id="highlighted"><?php print $highlighted; ?></div><?php endif; ?>
       <a id="main-content"></a>
       <?php if ($title): ?>
         <h1 class="title" id="page-title">