diff --git a/templates/package-snapshots.hamlet b/templates/package-snapshots.hamlet
index 015f89a..91985fc 100644
--- a/templates/package-snapshots.hamlet
+++ b/templates/package-snapshots.hamlet
@@ -1,18 +1,20 @@
-$newline never
 <div .container #snapshot-home .content>
     <div .row>
         <div .span12>
             <h1>Snapshots containing #{toHtml pn}
-            <p>Back to <a href=@{PackageR pn}>#{toHtml pn}
+            <p>Back to
+                <a href=@{PackageR pn}>#{toHtml pn}
             <table .table .snapshots>
                 <thead>
-                    <th>
-                        Package version
-                    <th>
-                        Snapshot
-                $forall (compiler, spi) <- snapshots
                     <tr>
-                        <td>
-                            #{spiVersionRev spi}
-                        <td>
-                            <a href=@{SnapshotR (spiSnapName spi) $ StackageSdistR $ PNVName pn}>#{snapshotPrettyName (spiSnapName spi) compiler}
+                        <th>
+                            Package version
+                        <th>
+                            Snapshot
+                <tbody>
+                    $forall (compiler, spi) <- snapshots
+                        <tr>
+                            <td>
+                                #{spiVersionRev spi}
+                            <td>
+                                <a href=@{SnapshotR (spiSnapName spi) $ StackageSdistR $ PNVName pn}>#{snapshotPrettyName (spiSnapName spi) compiler}
diff --git a/templates/package.hamlet b/templates/package.hamlet
index 3ee3112..79dc2ce 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -120,7 +120,7 @@ $newline never
                     $if (sppiForwardDepsCount sppi > 0)
                       <div .dependencies #dependencies>
                         Depends on #{renderNumPackages (sppiForwardDepsCount sppi)}
-                        <em>(<a href=@{makeDepsLink spi SnapshotPackageDepsR}>full list with versions</a>)</em>:
+                        \<em>(<a href=@{makeDepsLink spi SnapshotPackageDepsR}>full list with versions</a>)</em>:
                         <div .dep-list>
                             $forall (i, (name, range)) <- enumerate (sppiForwardDeps sppi)
                                 $if i /= 0
@@ -132,7 +132,7 @@ $newline never
                     $if (sppiReverseDepsCount sppi > 0)
                         <div .reverse-dependencies #reverse-dependencies>
                           Used by #{renderNumPackages (sppiReverseDepsCount sppi)} in <b>#{spiSnapName spi}</b>
-                          <em>(<a href=@{makeDepsLink spi SnapshotPackageRevDepsR}>full list with versions</a>)</em>:
+                          \<em>(<a href=@{makeDepsLink spi SnapshotPackageRevDepsR}>full list with versions</a>)</em>:
                           <div .dep-list>
                               $forall (i, (name, range)) <- enumerate (sppiReverseDeps sppi)
                                   $if i /= 0