diff --git a/css/layout.css b/css/layout.css
index d4c1bbe..98a2205 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -25,9 +25,9 @@ hr,
    This layout takes advantage of negative margins to float the sidebars to
    either side of the main content. It also floats the navigation above the
    content, but you could just as easily absolutely position it.
-   
+
    LC stands for Left Column, RC for Right Column
-   
+
    Obvously, this layout is for left-to-right languages. For a
    right-to-left layout, just swap all the left and rights below.
    */
@@ -84,3 +84,8 @@ hr,
 * html #sidebar-first {
   left: 160px;           /* RC width */
 }
+
+/* Get menu links on one line */
+#navigation .links li {
+  display:inline;
+}
\ No newline at end of file
diff --git a/page.tpl.php b/page.tpl.php
index 77c92df..8a0fbc5 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -100,7 +100,7 @@
     <?php print render($page['header']); ?>
 
     <?php if ($main_menu): ?>
-      <p id="skip-link"><em><a href="#navigation">Skip to Navigation</a></em> &darr;</p> 
+      <p id="skip-link"><em><a href="#navigation">Skip to Navigation</a></em> &darr;</p>
     <?php endif; ?>
 
   </div></header> <!-- /.section, /#header -->
@@ -136,8 +136,32 @@
     <?php if ($main_menu): ?>
       <hr />
       <nav id="navigation" role="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
-        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+      <?php print theme('links__system_main_menu', array(
+        'links' => $main_menu,
+        'attributes' => array(
+          'id' => 'main-menu',
+          'class' => array('links', 'clearfix'),
+        ),
+        'heading' => array(
+            'text' => t('Main menu'),
+            'level' => 'h2',
+            'class' => array('element-invisible'),
+          ),
+        )); ?>
+      <?php if ($secondary_menu): ?>
+        <?php print theme('links__system_secondary_menu', array(
+          'links' => $secondary_menu,
+          'attributes' => array(
+            'id' => 'secondary-menu',
+            'class' => array('links', 'clearfix'),
+          ),
+          'heading' => array(
+              'text' => t('Secondary menu'),
+              'level' => 'h2',
+              'class' => array('element-invisible'),
+            ),
+          )); ?>
+      <?php endif; ?>
       </div></nav> <!-- /.section, /#navigation -->
     <?php endif; ?>