diff --git a/css/data-explorer.css b/css/data-explorer.css
index 25e1ad3e..eaca2824 100644
--- a/css/data-explorer.css
+++ b/css/data-explorer.css
@@ -122,36 +122,11 @@
   * Notifications
   *********************************************************/
 
-.notification-container {
-  width: 400px;
-  left: 520px;
-  display: none;
-  position: fixed;
-  top: 0;
-  z-index: 100;
-  text-align: center;
-}
-
-.notification {
-  display: inline-block;
-  margin: 0 auto;
-  padding: 5px 8px 4px;
-  font-size: 1.3em;
-  text-align: left;
-  font-weight: bold;
-  background: #fe8;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-}
-
-.notification-action {
-  padding-left: 10px;
-}
-
 .notification-loader {
-  padding: 0 3px 0 0;
-  opacity: 0.3;
+  width: 18px;
+  margin-left: 5px;
+  background: url(images/small-spinner.gif) no-repeat;
+  display: inline-block;
 }
 
 
diff --git a/demo/images/small-spinner.gif b/css/images/small-spinner.gif
similarity index 100%
rename from demo/images/small-spinner.gif
rename to css/images/small-spinner.gif
diff --git a/src/view.js b/src/view.js
index 1a108cea..eb4aa413 100644
--- a/src/view.js
+++ b/src/view.js
@@ -185,9 +185,9 @@ my.QueryEditor = Backbone.View.extend({
       <input type="text" name="q" value="{{q}}" class="text-query" /> \
       <div class="pagination"> \
         <ul> \
-          <li class="prev action-pagination-update"><a>&laquo; back</a></li> \
+          <li class="prev action-pagination-update"><a>&laquo;</a></li> \
           <li class="active"><a><input name="from" type="text" value="{{from}}" /> &ndash; <input name="to" type="text" value="{{to}}" /> </a></li> \
-          <li class="next action-pagination-update"><a>next &raquo;</a></li> \
+          <li class="next action-pagination-update"><a>&raquo;</a></li> \
         </ul> \
       </div> \
       <button type="submit" class="btn" style="">Update &raquo;</button> \
@@ -306,7 +306,7 @@ my.notify = function(message, options) {
     <div class="alert alert-{{category}} fade in" data-alert="alert"><a class="close" data-dismiss="alert" href="#">×</a> \
       {{msg}} \
         {{#loader}} \
-        <img src="images/small-spinner.gif" class="notification-loader"> \
+        <span class="notification-loader">&nbsp;</span> \
         {{/loader}} \
     </div>';
   var _templated = $.mustache(_template, tmplData);