diff --git a/Handler/Hoogle.hs b/Handler/Hoogle.hs
index a5fa016..5ed65b7 100644
--- a/Handler/Hoogle.hs
+++ b/Handler/Hoogle.hs
@@ -37,12 +37,13 @@ getHoogleR slug = do
             , hqiLimitTo = count'
             , hqiOffsetBy = offset
             }
-        Nothing -> return $ HoogleQueryBad "No query provided"
-    let q = fromMaybe "" mquery
+        Nothing -> return $ HoogleQueryOutput "" [] Nothing
+    let queryText = fromMaybe "" mquery
         pageLink p = (HoogleR slug
             , (if exact then (("exact", "true"):) else id)
             $ (maybe id (\q' -> (("q", q'):)) mquery)
               [("page", tshow p)])
+        snapshotLink = SnapshotR slug StackageHomeR
         hoogleForm = $(widgetFile "hoogle-form")
     defaultLayout $ do
         setTitle "Hoogle Search"
diff --git a/Handler/StackageHome.hs b/Handler/StackageHome.hs
index 1da0082..24fa0e1 100644
--- a/Handler/StackageHome.hs
+++ b/Handler/StackageHome.hs
@@ -21,6 +21,10 @@ getStackageHomeR slug = do
                        then Just False
                        else Nothing
         base = maybe 0 (const 1) minclusive :: Int
+        hoogleForm =
+            let queryText = "" :: Text
+                exact = False
+            in $(widgetFile "hoogle-form")
     Entity sid _stackage <- runDB $ getBy404 $ UniqueSnapshot slug
     defaultLayout $ do
         setTitle $ toHtml $ stackageTitle stackage
diff --git a/templates/hoogle-form.hamlet b/templates/hoogle-form.hamlet
index 5da79cf..6a2730b 100644
--- a/templates/hoogle-form.hamlet
+++ b/templates/hoogle-form.hamlet
@@ -1,5 +1,5 @@
-<form action=@{HoogleR slug}>
-    <input type=search autofocus name=q value=#{q} placeholder="Hoogle Search Phrase" .search>
+<form .hoogle action=@{HoogleR slug}>
+    <input type=search autofocus name=q value=#{queryText} placeholder="Hoogle Search Phrase" .search>
     <input .btn type="submit" value="Search">
     <label .checkbox .exact-lookup for=exact title="Only find identifiers matching your search term precisely">
         <input type=checkbox name=exact :exact:checked #exact>
diff --git a/templates/hoogle-form.lucius b/templates/hoogle-form.lucius
index ba4f1b9..7056fbd 100644
--- a/templates/hoogle-form.lucius
+++ b/templates/hoogle-form.lucius
@@ -1,8 +1,14 @@
-input[type=submit] {
-  margin-bottom: 10px;
+form.hoogle {
+  margin-bottom: 20px;
+  .search {
+    width: 25em;
+  }
+  input {
+    margin-bottom: 0;
+  }
 }
 
 .exact-lookup {
   display: inline-block;
-  margin-left: 0.5em;
+  margin-left: 1em;
 }
diff --git a/templates/hoogle.hamlet b/templates/hoogle.hamlet
index 45a7b4d..fa40487 100644
--- a/templates/hoogle.hamlet
+++ b/templates/hoogle.hamlet
@@ -1,11 +1,13 @@
 <div .container>
     <div .content>
         <h1>Hoogle Search
+        <p>Within <a href=@{snapshotLink}>#{stackageTitle stackage}</a>
         ^{hoogleForm}
         $case mresults
-            $of HoogleQueryBad _err
-            $of HoogleQueryOutput query results mtotalCount
-                <p>Searched for: #{preEscapedToHtml query}
+            $of HoogleQueryBad err
+                <p>#{err}
+                <p>For information on what queries should look like, see the <a href="http://www.haskell.org/haskellwiki/Hoogle">hoogle user manual</a>.
+            $of HoogleQueryOutput _query results mtotalCount
                 $if null results
                     <p>Your search produced no results.
                 $else
diff --git a/templates/hoogle.lucius b/templates/hoogle.lucius
index 7b9edf4..c338c97 100644
--- a/templates/hoogle.lucius
+++ b/templates/hoogle.lucius
@@ -6,6 +6,16 @@ ol.search-results {
 
 .self {
   margin-bottom: 0;
+  /* Use bold instead of italics to indicate matching part of search */
+  a {
+    b {
+      font-weight: normal;
+    }
+    i {
+      font-weight: bold;
+      font-style: normal;
+    }
+  }
 }
 
 table.sources {
@@ -24,7 +34,7 @@ table.sources {
 
 .docs {
   white-space: pre-wrap;
-  background: #f8f8f8;
+  background: #e8e8e8;
 }
 
 .docs, .nodocs {
diff --git a/templates/stackage-home.hamlet b/templates/stackage-home.hamlet
index 671c45a..dfdfa69 100644
--- a/templates/stackage-home.hamlet
+++ b/templates/stackage-home.hamlet
@@ -38,8 +38,10 @@ $newline never
         <a href=@{SnapshotR slug StackageCabalConfigR}?global=true>
             the global configuration instructions
 
-    <h3>
-        Packages
+    <h3>Hoogle
+    ^{hoogleForm}
+
+    <h3>Packages
 
 <div .container .content>
     <div .packages>