diff --git a/CHANGELOG b/CHANGELOG
index d30e7b0abd..3bc7c726cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 v1.3 (XXXX-XX-XX)
 -----------------
 
+* fixed shapedjson to json conversion for special numeric values (NaN, +inf, -inf).
+  Before, "NaN", "inf", or "-inf" were written into the JSONified output, but these 
+  values are not allowed in JSON. Now, "null" is written to the JSONified output as
+  required.
+
 * added AQL functions VARIANCE_POPULATION(), VARIANCE_SAMPLE(), STDDEV_POPULATION(),
   STDDEV_SAMPLE(), AVERAGE(), MEDIAN() to calculate stastical values for lists
 
diff --git a/frontend/css/collectionsView.css b/frontend/css/collectionsView.css
index 3646e2374e..873b70f957 100644
--- a/frontend/css/collectionsView.css
+++ b/frontend/css/collectionsView.css
@@ -98,6 +98,8 @@
 #transparentHeader i {
   margin-top: 2px;
   margin-right: 2px;
+  left: 10px;
+  position: absolute;
 }
 
 #transparentHeader a.disabledBread {
diff --git a/frontend/css/footerView.css b/frontend/css/footerView.css
index 4a0c1b6c2c..48544545c5 100644
--- a/frontend/css/footerView.css
+++ b/frontend/css/footerView.css
@@ -1,15 +1,10 @@
 .footer {
   background: url("../img/footer_hd_bg.png") repeat-x scroll left 10px #4A4A4A;
   font-size: 14px;
-  margin: 30px auto 0;
   text-align: center;
-  bottom:0;
   left: 0;
   right: 0;
-  bottom:200;
-  margin-top:100px;
-  width: 100%;
-  display:none;
+  margin-top:300px;
 }
 
 .footerExtra {
@@ -49,6 +44,7 @@
 .footer p {
   padding-top: 10px;
   padding-bottom: 10px;
+  margin-bottom:0;
 }
 
 .footer span a {
diff --git a/frontend/index.html b/frontend/index.html
index 8aadbfe56e..9549e36f6b 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -42,11 +42,11 @@
     <div id="modalPlaceholder" style:"display:none">
     </div>
 
-    <footer class="footer">
-    </footer>
-
   </div>
 
+  <footer class="footer">
+  </footer>
+
   <!-- libs -->
   <script src="js/lib/jquery-1.8.3.js"></script>
   <script src="js/lib/jquery-ui-1.9.2.custom.js"></script>
diff --git a/frontend/js/templates/documentsView.ejs b/frontend/js/templates/documentsView.ejs
index 056eb33639..5f87ce24ea 100644
--- a/frontend/js/templates/documentsView.ejs
+++ b/frontend/js/templates/documentsView.ejs
@@ -2,8 +2,8 @@
   <div id="transparentHeader">
     <div id="documentsToolbar" class="pagination pagination-small pagination-right">
 		<ul>
-			<li class="enabled"><a id="collectionPrev">&lsaquo;</a></li>
-			<li class="enabled"><a id="collectionNext">&rsaquo;</a></li>
+			<li class="enabled"><a id="collectionPrev"><i class="icon icon-white icon-chevron-left"></i></a></li>
+			<li class="enabled"><a id="collectionNext"><i class="icon icon-white icon-chevron-right"></i></a></li>
 		</ul>
 	</div>
   </div>
@@ -20,20 +20,7 @@
   </thead>
 </table>
 
-
-<!--
-<div id="documentsToolbar" class="pagination pagination-small pagination-centered arangoToolbar">
-	<ul>
- 		<li class="enabled"><a href="#">&laquo;</a></li>
-		<li class="active"><a href="#">1</a></li>
-		<li><a href="#">2</a></li>
-		<li><a href="#">3</a></li>
- 		<li class="enabled"><a href="#">&raquo;</a></li>
-	</ul>
-</div>
--->
-
-  <div id="documentsToolbarF" class="pagination pagination-small pagination-centered"></div>
+<div id="documentsToolbarF" class="pagination pagination-small pagination-centered"></div>
 
 
 <!-- Delete Modal -->
diff --git a/lib/ShapedJson/shaped-json.c b/lib/ShapedJson/shaped-json.c
index f7409f9e98..3c67eb703c 100644
--- a/lib/ShapedJson/shaped-json.c
+++ b/lib/ShapedJson/shaped-json.c
@@ -1476,7 +1476,23 @@ static bool StringifyJsonShapeDataNumber (TRI_shaper_t* shaper,
   int res;
 
   v = * (TRI_shape_number_t const*) data;
-  res = TRI_AppendDoubleStringBuffer(buffer, v);
+  // check for special values
+
+  if (v != v) {
+    // NaN
+    res = TRI_AppendStringStringBuffer(buffer, "null");
+  }
+  else if (v == HUGE_VAL) {
+    // +inf
+    res = TRI_AppendStringStringBuffer(buffer, "null");
+  }
+  else if (v == -HUGE_VAL) {
+    // -inf
+    res = TRI_AppendStringStringBuffer(buffer, "null");
+  }
+  else {
+    res = TRI_AppendDoubleStringBuffer(buffer, v);
+  }
 
   if (res != TRI_ERROR_NO_ERROR) {
     return false;