diff --git a/Handler/Home.hs b/Handler/Home.hs
index 274e3b9..7daaa40 100644
--- a/Handler/Home.hs
+++ b/Handler/Home.hs
@@ -44,14 +44,16 @@ getHomeR = do
           min' <- handlerToWidget $ linkFor $ name "inclusive"
           when (isJust mex || isJust min')
               [whamlet|
-                  <dt>#{asHtml title}
-                  <dd>
-                      $maybe ex <- mex
-                        <a href=@{StackageHomeR ex}>exclusive
-                      $if isJust mex && isJust min'
-                        \ | #
-                      $maybe in <- min'
-                        <a href=@{StackageHomeR in}>inclusive
+                  <tr>
+                     <td>
+                         #{asHtml title}
+                     <td>
+                         $maybe ex <- mex
+                           <a href=@{StackageHomeR ex}>exclusive
+                         $if isJust mex && isJust min'
+                     <td>
+                         $maybe in <- min'
+                           <a href=@{StackageHomeR in}>inclusive
               |]
         where
           name suffix = concat ["unstable-", short, "-", suffix]
diff --git a/templates/homepage.hamlet b/templates/homepage.hamlet
index 9372026..873f0d3 100644
--- a/templates/homepage.hamlet
+++ b/templates/homepage.hamlet
@@ -3,7 +3,7 @@
         Stackage is an infrastructure to create stable builds
         of complete package sets. Think “stable Hackage”.
     <h2 .recommended-snapshots>Recommended Snapshots
-    <dl .snapshots>
+    <table .snapshots>
         ^{addSnapshot "GHC 7.8" "ghc78"}
         ^{addSnapshot "GHC 7.8 + Haskell Platform" "ghc78hp"}
         ^{addSnapshot "GHC 7.6" "ghc76"}
diff --git a/templates/homepage.lucius b/templates/homepage.lucius
index b224905..5dbde75 100644
--- a/templates/homepage.lucius
+++ b/templates/homepage.lucius
@@ -5,6 +5,7 @@ h2 {
 
 .recommended-snapshots {
   margin-top: 30px;
+  margin-bottom: 20px;
 }
 
 .how-stackage-works {
@@ -14,11 +15,9 @@ h2 {
 .snapshots {
   margin-left: 0;
   padding-left: 0;
-  li {
-    list-style-type: none;
-    margin-left: 0;
-    padding-left: 0;
-    font-weight: bold;
+  td {
+    padding: 0 0.25em 0.25em 0.25em;
+    a { font-weight: bold }
   }
 }