diff --git a/src/components/ComponentLoader/index.js b/src/components/ComponentLoader/index.js
index f41fe4f9b..8adb23c1b 100644
--- a/src/components/ComponentLoader/index.js
+++ b/src/components/ComponentLoader/index.js
@@ -2,7 +2,7 @@ import React, { PropTypes } from 'react';
 
 const ComponentLoader = ({ isLoading, error, pastDelay }) => {
   if (isLoading) {
-    return pastDelay ? <div>Loading...</div> : null;
+    return pastDelay ? <noscript /> : null;
   } else if (error) {
     return <div>Error! Component failed to load</div>;
   }
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
index 93e59b5c8..b99e2f7e7 100644
--- a/src/components/Footer/index.js
+++ b/src/components/Footer/index.js
@@ -28,12 +28,12 @@ const Footer = () => (
                   </Link>
                 </li>
                 <li>
-                  <Link to="/contact">
+                  <a href="https://quran.zendesk.com/hc/en-us/requests/new">
                     <LocaleFormattedMessage
                       id="nav.contactUs"
                       defaultMessage="Contact Us"
                     />
-                  </Link>
+                  </a>
                 </li>
                 <li>
                   <a
diff --git a/src/components/Verse/style.scss b/src/components/Verse/style.scss
index 46fcad6c4..505d22c7b 100644
--- a/src/components/Verse/style.scss
+++ b/src/components/Verse/style.scss
@@ -75,10 +75,10 @@
   float: left;
 
   b, span{
-    float: right;
     border-color: transparent;
     border-width: 0px 0px 1px 0px;
     border-style: solid;
+    float: right;
     &.active {
       color: $brand-primary-darker-5;
       border-color: $brand-primary-darker-15;
@@ -87,7 +87,7 @@
 
   .line{
     direction: rtl;
-    b{
+    b, span{
       float: none;
       display: inline-block;
     }
diff --git a/src/redux/actions/audioplayer.js b/src/redux/actions/audioplayer.js
index c63372798..87ad25490 100644
--- a/src/redux/actions/audioplayer.js
+++ b/src/redux/actions/audioplayer.js
@@ -101,7 +101,7 @@ export function load({ chapterId, verseId, verseKey, audio }) { // eslint-disabl
     types: [LOAD, LOAD_SUCCESS, LOAD_FAIL],
     promise: client => client.get(`/api/v3/chapters/${chapterId}/verses/${verseId}/audio_files`, {
       params: {
-        recitation: audio || 8 // NOTE: default, but should never be used
+        recitation: audio || 7 // NOTE: default, but should never be used
       }
     }),
     verseKey,
diff --git a/src/redux/modules/options.js b/src/redux/modules/options.js
index aa1593909..e9ee5ce0f 100644
--- a/src/redux/modules/options.js
+++ b/src/redux/modules/options.js
@@ -13,8 +13,8 @@ const initialState = {
   isShowingSurahInfo: false,
   loadingRecitations: false,
   loadingTranslations: false,
-  audio: 8,
-  translations: [20],
+  audio: 7, // Mishari Rashid al-`Afasy
+  translations: [20],  // Sahih International
   tooltip: 'translation',
   userAgent: null,
   footNote: null,
diff --git a/src/server/config/sitemap.js b/src/server/config/sitemap.js
index 9bb0ac1d1..da2478623 100644
--- a/src/server/config/sitemap.js
+++ b/src/server/config/sitemap.js
@@ -9,17 +9,17 @@ export default (server) => {
 
     client.get('/api/v3/chapters').then((response) => {
       response.chapters.forEach((chapter) => {
-        Array(chapter.versesCount).fill().forEach((_, index) => {
-          const ayahId = index + 1;
+        Array(chapter.verses_count).fill().forEach((_, index) => {
+          const verseId = index + 1;
 
           urls.push({
-            url: `/${chapter.id}/${ayahId}`,
+            url: `/${chapter.id}/${verseId}`,
             changefreq: 'weekly',
             priority: 1
           });
 
           urls.push({
-            url: `/${chapter.id}/${ayahId}-${ayahId + 9}`,
+            url: `/${chapter.id}/${verseId}-${verseId + 9}`,
             changefreq: 'weekly',
             priority: 1
           });
@@ -62,7 +62,6 @@ export default (server) => {
         });
       });
 
-
       const xml = sitemap.createSitemap({
         hostname: 'https://quran.com',
         cacheTime: 600000,  // 600 sec cache period