diff --git a/pinry/static/css/pinry.css b/pinry/static/css/pinry.css
index 374c5fb..f5307c7 100644
--- a/pinry/static/css/pinry.css
+++ b/pinry/static/css/pinry.css
@@ -201,3 +201,10 @@ a {
         .form-actions {
             margin-bottom: 0;
         }
+
+.spinner {
+    background: url('../img/loader.gif');
+    width: 31px;
+    height: 31px;
+    margin: auto;
+}
diff --git a/pinry/static/js/helpers.js b/pinry/static/js/helpers.js
index b3ec810..5ed49de 100644
--- a/pinry/static/js/helpers.js
+++ b/pinry/static/js/helpers.js
@@ -14,9 +14,13 @@ function renderTemplate(templateId, context) {
 
 
 function cleanTags(tags) {
-    if (typeof tags === 'string') {
-        tags = tags.split(',');
-        for (var i in tags) tags[i] = tags[i].trim();
+    if (typeof tags === 'string' && tags.length > 0) {
+        tags = tags.split(/[\s,]+/);
+        for (var i in tags) {
+            tags[i] = tags[i].trim();
+        }
+    } else {
+        return null;
     }
     return tags;
 }
diff --git a/pinry/templates/base.html b/pinry/templates/base.html
index a9d9b97..d0f5cdb 100644
--- a/pinry/templates/base.html
+++ b/pinry/templates/base.html
@@ -15,7 +15,7 @@
             \  \:\       \__\/      \  \:\        \  \:\           \__\/
              \__\/                   \__\/         \__\/             -->
 
-        <title>{{ SITE_NAME }} - {% block title %}{% endblock %}</title>
+        <title>{% block title %}{{ SITE_NAME }}{% endblock %}</title>
 
         <!-- CSS -->
         <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Monoton"/>
diff --git a/pinry/templates/core/pins.html b/pinry/templates/core/pins.html
index fb163f8..3f99e09 100644
--- a/pinry/templates/core/pins.html
+++ b/pinry/templates/core/pins.html
@@ -1,14 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Recent Pins{% endblock %}
-
 {% block yield %}
     <div id="pins"></div>
-    <div class="container spinner">
-        <div class="row">
-            <div class="span12" align="center">
-                <img src="{{ STATIC_URL }}img/loader.gif" alt="Loader">
-            </div>
-        </div>
-    </div>
+    <div class="spinner"></div>
 {% endblock %}