diff --git a/src/config.js b/src/config.js
index 13f2c942d..9c069a7c7 100644
--- a/src/config.js
+++ b/src/config.js
@@ -66,7 +66,7 @@ module.exports = Object.assign({
         {name: 'msapplication-square310x310logo', content: '/mstitle-310x310.jpg'}
       ],
       link: [
-        {rel: 'manifest', href: 'manifest.json'},
+        {rel: 'manifest', href: '/manifest.json'},
         {rel: 'search', type: 'application/opensearchdescription+xml', href: '/opensearch.xml', title: 'Quran.com'},
         {rel:'fluid-icon', href: '/apple-touch-icon-180x180.png', title: 'Quran.com'},
         {rel: 'icon', type: 'image/png', href: '/favicon-32x32.png', sizes:'32x32'},
@@ -74,7 +74,7 @@ module.exports = Object.assign({
         {rel: 'icon', type: 'image/png', href: '/favicon-16x16.png', sizes: '16x16'},
         {rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#004f54'},
         {rel: 'shortcut icon', href: '/favicon.ico', type: 'image/x-icon'},
-        {rel: 'apple-touch-icon', href: 'apple-touch-icon.png'},
+        {rel: 'apple-touch-icon', href: '/apple-touch-icon.png'},
         {rel: 'apple-touch-icon', sizes: '57x57', href:' /apple-touch-icon-57x57.png'},
         {rel: 'apple-touch-icon', sizes: '72x72', href: '/apple-touch-icon-72x72.png'},
         {rel: 'apple-touch-icon', sizes: '76x76', href: '/apple-touch-icon-76x76.png'},
diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js
index 1f7c6f013..5595f8c3c 100644
--- a/src/containers/Surah/index.js
+++ b/src/containers/Surah/index.js
@@ -258,7 +258,7 @@ class Surah extends Component {
       return `Surat ${surah.name.simple} [verse ${params.range}]`;
     }
 
-    return `${surah.info.shortDescription} This Surah has ${surah.ayat} ayahs and resides between pages ${surah.page[0]} to ${surah.page[1]} in the Quran.`; // eslint-disable-line max-len
+    return `${surah.info ? surah.info.shortDescription : ''} This Surah has ${surah.ayat} ayahs and resides between pages ${surah.page[0]} to ${surah.page[1]} in the Quran.`; // eslint-disable-line max-len
   }
 
   renderPagination() {
diff --git a/src/styles/bootstrap.config.js b/src/styles/bootstrap.config.js
index bdc2e8915..d888ab8a5 100644
--- a/src/styles/bootstrap.config.js
+++ b/src/styles/bootstrap.config.js
@@ -7,12 +7,12 @@ module.exports = {
   "scripts": {
     "transition": false,
     "alert": false,
-    "button": false,
+    "button": true,
     "carousel": false,
     "collapse": false,
-    "dropdown": false,
+    "dropdown": true,
     "modal": false,
-    "tooltip": false,
+    "tooltip": true,
     "popover": false,
     "scrollspy": false,
     "tab": false,