diff --git a/Data/WebsiteContent.hs b/Data/WebsiteContent.hs
index 72c39de..4d03d60 100644
--- a/Data/WebsiteContent.hs
+++ b/Data/WebsiteContent.hs
@@ -4,7 +4,6 @@ module Data.WebsiteContent
     ) where
 
 import ClassyPrelude.Yesod
-import Text.Blaze.Html (preEscapedToMarkup)
 import Text.Markdown (markdown, msXssProtect, msAddHeadingId)
 
 data WebsiteContent = WebsiteContent
diff --git a/Handler/Package.hs b/Handler/Package.hs
index 934f191..a83558f 100644
--- a/Handler/Package.hs
+++ b/Handler/Package.hs
@@ -89,7 +89,10 @@ getPackageR pn = do
                        then "You liked this!"
                        else "I like this!" :: Text
 
-    let synopsis = metadataSynopsis metadata
+    let homepage = case T.strip (metadataHomepage metadata) of
+                     x | null x -> Nothing
+                       | otherwise -> Just x
+        synopsis = metadataSynopsis metadata
         deps = enumerate (metadataDeps metadata)
         revdeps = enumerate revdeps'
         authors = enumerate (parseIdentitiesLiberally (metadataAuthor metadata))
diff --git a/templates/package.hamlet b/templates/package.hamlet
index d2847a6..d2290c6 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -8,6 +8,11 @@ $newline never
                  #{metadataVersion metadata} #
             <p .synopsis>
                 #{synopsis}
+               \ #
+               $maybe url <- homepage
+                   <a href="#{url}">
+                       #{url}
+
             $forall (i,(version, title, slug, hasHaddocks)) <- packages
                $if i /= 0
                  , #
@@ -17,10 +22,15 @@ $newline never
                  <a href=@{haddocksLink slug version}>
                      #{version}
                  )
-
     <div .row>
         <div .span12>
             <div .tags>
+                <span .likes>
+                    <span #likes>
+                        #{nLikes}
+                    \ likes #
+                    <i .fa :liked:.fa-thumbs-up :not liked:.fa-thumbs-o-up #like title="#{likeTitle}">
+
                 $if null tags
                     <span .no-tags>
                         No tags yet. #
@@ -40,11 +50,6 @@ $newline never
                         <input type="submit" .btn #add-form-btn value="Confirm">
                     <p #tag-msg .alert .alert-error style="display:none">
 
-            <div .social>
-                <span #likes>
-                    #{nLikes}
-                \ likes #
-                <i .fa :liked:.fa-thumbs-up :not liked:.fa-thumbs-o-up #like title="#{likeTitle}">
             <div .authorship>
                 <span .license>
                     <a href="">
@@ -67,8 +72,8 @@ $newline never
                                       #{name}
                               $of _
 
-            $if not (null maintainers)
-                <div .maintainer>
+           <div .maintainer>
+               $if not (null maintainers)
                     Maintained by #
                     $forall (i,identity) <- maintainers
                          <strong .author>
diff --git a/templates/package.lucius b/templates/package.lucius
index 81aa0cf..5531a90 100644
--- a/templates/package.lucius
+++ b/templates/package.lucius
@@ -188,6 +188,7 @@ h2.changes-title {
   }
 }
 
+.likes { margin-right: 1em; }
 .no-tags {
   color: #888;
 }