diff --git a/endpoints/web.py b/endpoints/web.py
index c76d2f60b..188533721 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -11,7 +11,7 @@ from data import model
 from app import app, login_manager, mixpanel
 from auth.permissions import QuayDeferredPermissionUser, AdministerOrganizationPermission
 from util.invoice import renderInvoiceToPdf
-from util.seo import renderSnapshot
+from util.seo import render_snapshot
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +54,7 @@ def index(path):
 @app.route('/snapshot/', methods=['GET'])
 @app.route('/snapshot/<path:path>', methods=['GET'])
 def snapshot(path = ''):
-  result = renderSnapshot(path)
+  result = render_snapshot(path)
   if result:
     return result
 
diff --git a/static/partials/header.html b/static/partials/header.html
index 34e2d2231..1bb22afbf 100644
--- a/static/partials/header.html
+++ b/static/partials/header.html
@@ -22,15 +22,17 @@
 
   
   <ul class="nav navbar-nav navbar-right" ng-switch on="user.anonymous">
-    <form class="navbar-form navbar-left" role="search">
-      <div class="form-group">
-        <input id="repoSearch" type="text" class="form-control" placeholder="Find Repo">
-      </div>
-    </form>
-    
-    <span class="navbar-left user-tools" ng-show="!user.anonymous">
-      <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" title="Create new repository"></i></a>
-    </span>
+    <li>
+      <form class="navbar-form navbar-left" role="search">
+        <div class="form-group">
+          <input id="repoSearch" type="text" class="form-control" placeholder="Find Repo">
+        </div>
+      </form>
+      
+      <span class="navbar-left user-tools" ng-show="!user.anonymous">
+        <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" title="Create new repository"></i></a>
+      </span>
+    </li>
 
     <li class="dropdown" ng-switch-when="false">
       <a href="javascript:void(0)" class="dropdown-toggle user-dropdown" data-toggle="dropdown">
diff --git a/util/seo.py b/util/seo.py
index 6958e2c67..c44d2a9ea 100644
--- a/util/seo.py
+++ b/util/seo.py
@@ -1,27 +1,24 @@
 import subprocess
-import urllib
-import os
 import logging
-import codecs
 
 from bs4 import BeautifulSoup
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
-def renderSnapshot(path):
-    final_url = 'http://localhost:5000/' + path
-    logger.info('Snapshotting url: %s -> %s' % (path, final_url))
-    out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
-                                        'util/phantomjs-runner.js', final_url])
+def render_snapshot(path):
+  final_url = 'http://localhost:5000/' + path
+  logger.info('Snapshotting url: %s -> %s' % (path, final_url))
+  out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
+                                      'util/phantomjs-runner.js', final_url])
 
-    if not out_html or out_html.strip() == 'Not Found':
-      return None
+  if not out_html or out_html.strip() == 'Not Found':
+    return None
 
-    # Remove script tags
-    soup = BeautifulSoup(out_html)
-    to_extract = soup.findAll('script')
-    for item in to_extract:
-        item.extract()
+  # Remove script tags
+  soup = BeautifulSoup(out_html.decode('utf8'))
+  to_extract = soup.findAll('script')
+  for item in to_extract:
+    item.extract()
 
-    return soup.prettify()
+  return str(soup)