diff --git a/Handler/Package.hs b/Handler/Package.hs
index b798e8b..5f5f392 100644
--- a/Handler/Package.hs
+++ b/Handler/Package.hs
@@ -7,6 +7,7 @@ module Handler.Package
     , getPackageSnapshotsR
     , packagePage
     , getPackageBadgeR
+    , renderNoPackages
     ) where
 
 import           Data.Char
@@ -161,13 +162,13 @@ data Identifier
 --
 parseIdentitiesLiberally :: Text -> [Identifier]
 parseIdentitiesLiberally =
-  filter (not . empty) .
+  filter (not . emptyPlainText) .
   map strip .
   concatPlains .
   map parseChunk .
   T.split (== ',')
-  where empty (PlainText e) = T.null e
-        empty _ = False
+  where emptyPlainText (PlainText e) = T.null e
+        emptyPlainText _ = False
         strip (PlainText t) = PlainText (T.strip t)
         strip x = x
         concatPlains = go
@@ -226,3 +227,7 @@ getPackageSnapshotsR pn =
            $(combineStylesheets 'StaticR
                                 [css_font_awesome_min_css])
            $(widgetFile "package-snapshots"))
+
+renderNoPackages :: Int -> Text
+renderNoPackages n =
+  T.pack $ show n ++ " package" ++ (if n == 1 then "" else "s")
diff --git a/Stackage/Database.hs b/Stackage/Database.hs
index a6ef073..a1da774 100644
--- a/Stackage/Database.hs
+++ b/Stackage/Database.hs
@@ -470,7 +470,7 @@ snapshotTitle :: Snapshot -> Text
 snapshotTitle s = prettyName (snapshotName s) (snapshotGhc s)
 
 prettyName :: SnapName -> Text -> Text
-prettyName name ghc = concat [prettyNameShort name, " - GHC ", ghc]
+prettyName name ghc = concat [prettyNameShort name, " (ghc-", ghc, ")"]
 
 prettyNameShort :: SnapName -> Text
 prettyNameShort name =
diff --git a/templates/package.hamlet b/templates/package.hamlet
index 7ce5c34..9118d7b 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -15,9 +15,7 @@ $newline never
                       <a href="@{PackageR $ PackageName pn}">
                         #{pn}
             <h1>
-               #{pn} #
-               <span .latest-version>
-                 #{displayedVersion} #
+               #{pn}
             <p .synopsis>
                 #{synopsis}
                \ #
@@ -25,11 +23,19 @@ $newline never
                    <a href="#{url}">
                        #{url}
 
-            $forall (idx, li) <- enumerate latests
-                 $if idx /= 0
-                    , #
-                 <a href=@{SnapshotR (liSnapName li) StackageHomeR}>
-                    #{prettyName (liSnapName li) (liGhc li)} (#{liVersion li})
+            $forall li <- latests
+                 <div>
+                   <a href=@{SnapshotR (liSnapName li) StackageHomeR}>
+                      #{prettyName (liSnapName li) (liGhc li)}
+                   \: #
+                   <span .version>
+                      #{liVersion li}
+            <div>
+              <a href="https://hackage.haskell.org/package/#{pn}">
+                 Hackage
+              \: #
+              <span .version>
+                 #{displayedVersion} #
 
             $if null latests
                 <p .add-to-nightly>
@@ -41,8 +47,7 @@ $newline never
         <div .span12>
             <div .authorship>
                 <span .license>
-                    <a href="">
-                        #{packageLicenseName package} licensed #
+                    #{packageLicenseName package} licensed #
                     $if null maintainers
                         and maintained #
                 $if not (null authors)
@@ -117,7 +122,7 @@ $if not (LT.null (LT.renderHtml (packageChangelog package)))
     <div .row>
         <div .span12>
             <div .dependencies #dependencies>
-                Depends on
+                Depends on:
                 <div .dep-list>
                     $forall (i,(name, range)) <- deps
                         $if i /= 0
@@ -126,7 +131,7 @@ $if not (LT.null (LT.renderHtml (packageChangelog package)))
                             #{name}
             $if not $ null revdeps
               <div .reverse-dependencies .expanding #reverse-dependencies>
-                Used by
+                Used by #{renderNoPackages $ length revdeps}:
                 <div .dep-list>
                     $forall (i,(name, range)) <- revdeps
                         $if i /= 0
diff --git a/templates/package.lucius b/templates/package.lucius
index cc49a22..167973a 100644
--- a/templates/package.lucius
+++ b/templates/package.lucius
@@ -11,9 +11,8 @@ h3 {
   width: auto;
   margin-left: auto;
 }
-.latest-version {
-  color: #777;
-  font-size: 24.5px;
+.version {
+  font-weight: bold;
 }
 #disqus_thread {
   margin-top: 2em;