diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 763b38e..20fc699 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -22,7 +22,7 @@
                   <a href=@{route}>#{route}
           $maybe Entity _ user <- muser
               <li>
-                  <a href=@{ProfileR}>
+                  <a href=@{ProfileR} .user-handle>
                       #{userDisplay user} (#{userHandle user})
               <li>
                 <a href=@{AuthR LogoutR}>Logout
diff --git a/templates/package.hamlet b/templates/package.hamlet
index 0dbf08b..3a33dee 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -31,31 +31,31 @@ $newline never
 
     <div .row>
         <div .span12>
-            <div .tags>
-                <span .likes .social>
+            <div .social>
+                <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. #
-                $forall (tag,count,tagged) <- tags
-                    <span .tag>
-                        <a href=@{TagR tag} .tag-name>
-                            #{tag} #
-                        <a .tag-count .tag-toggle data-slug=#{tag} :tagged:.tagged title="Add/remove vote for: #{tag}">
-                            #{count}
-                        , #
-                <i #add-tag class="fa fa-plus-square" title="Show/hide tag form">
-                <form #add-tag-form .hidden>
-                    <p>
-                        <strong>Add tag
-                    <div .input-append>
-                        <input type="text" id="new-tag">
-                        <input type="submit" .btn #add-form-btn value="Confirm">
-                    <p #tag-msg .alert .alert-error style="display:none">
+                <span .tags>
+                    $if null tags
+                        <span .no-tags>
+                            No tags yet. #
+                    $forall (tag,count,tagged) <- tags
+                        <span .tag>
+                            <a href=@{TagR tag} .tag-name>
+                                #{tag} #
+                            <a .tag-count .tag-toggle data-slug=#{tag} :tagged:.tagged title="Add/remove vote for: #{tag}">
+                                #{count}
+                            , #
+                    <i #add-tag class="fa fa-plus-square" title="Show/hide tag form">
+                    <form #add-tag-form .hidden>
+                        <p>
+                            <strong>Add tag
+                        <div .input-append>
+                            <input type="text" id="new-tag">
+                            <input type="submit" .btn #add-form-btn value="Confirm">
+                        <p #tag-msg .alert .alert-error style="display:none">
 
             <div .authorship>
                 <span .license>
diff --git a/templates/package.lucius b/templates/package.lucius
index 616a558..eb3ad67 100644
--- a/templates/package.lucius
+++ b/templates/package.lucius
@@ -30,12 +30,13 @@ h3 {
 .fa-twittersquare {
   color: #0088cc
 }
-.tags {
-  margin-top: 0.5em;
+.social {
   border-top: 1px solid #ddd;
   padding-top: 0.5em;
-}
-.social {
+  margin-bottom: 0.5em;
+  margin-top: 0.5em;
+  border-bottom: 1px solid #ddd;
+  padding-bottom: 0.5em;
   .fa-thumbs-o-up {
     color: rgba(0, 39, 59, 0.34902);
     cursor: pointer;