diff --git a/package.json b/package.json
index 0c9b328b4..e1d3cfdd4 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "promise": "7.1.1",
     "proxy-middleware": "0.14.0",
     "qs": "6.2.1",
-    "quran-components": "^0.0.78",
+    "quran-components": "^0.0.80",
     "raven": "1.1.1",
     "raw-loader": "0.5.1",
     "react": "15.4.1",
diff --git a/src/components/Audioplayer/Track/index.js b/src/components/Audioplayer/Track/index.js
index defde1f00..9c1e8d300 100644
--- a/src/components/Audioplayer/Track/index.js
+++ b/src/components/Audioplayer/Track/index.js
@@ -16,8 +16,7 @@ const Progress = styled.div`
   position: relative;
   padding-left: 12px;
 
-
-  &:after{
+  &:after {
     content: '';
     height: 12px;
     width: 12px;
@@ -27,7 +26,7 @@ const Progress = styled.div`
     display: block;
     background: #fff;
     top: -3px;
-    box-shadow: 0 1px 2px rgba(0,0,0,0.45);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.45);
     transition: height 0.5s;
   }
 `;
diff --git a/src/components/Audioplayer/index.js b/src/components/Audioplayer/index.js
index e6a2521dc..c001f8467 100644
--- a/src/components/Audioplayer/index.js
+++ b/src/components/Audioplayer/index.js
@@ -64,12 +64,14 @@ export class Audioplayer extends Component {
       audio
     });
 
-    load({
-      chapterId: nextVerse.chapterId,
-      verseId: nextVerse.id,
-      verseKey: nextVerse.verseKey,
-      audio
-    });
+    if (nextVerse) {
+      load({
+        chapterId: nextVerse.chapterId,
+        verseId: nextVerse.id,
+        verseKey: nextVerse.verseKey,
+        audio
+      });
+    }
 
     return false;
   }
@@ -480,18 +482,20 @@ export class Audioplayer extends Component {
           style.isPlaying} ${style.container} ${className}`}
       >
         <Wrapper>
-          {currentFile &&
+          {currentFile && (
             <Track
               progress={currentTime / duration * 100}
               onTrackChange={this.handleTrackChange}
-            />}
+            />
+          )}
           {segments &&
-            segments[currentVerse.verseKey] &&
-            <Segments
-              segments={segments[currentVerse.verseKey]}
-              currentVerse={currentVerse.verseKey}
-              currentTime={currentTime}
-            />}
+            segments[currentVerse.verseKey] && (
+              <Segments
+                segments={segments[currentVerse.verseKey]}
+                currentVerse={currentVerse.verseKey}
+                currentTime={currentTime}
+              />
+            )}
         </Wrapper>
         <ul className="list-inline" style={{ margin: 0 }}>
           <ControlItem>
@@ -501,15 +505,9 @@ export class Audioplayer extends Component {
             />
             : {currentVerse.verseKey.split(':')[1]}
           </ControlItem>
-          <ControlItem>
-            {this.renderPreviousButton()}
-          </ControlItem>
-          <ControlItem>
-            {this.renderPlayStopButtons()}
-          </ControlItem>
-          <ControlItem>
-            {this.renderNextButton()}
-          </ControlItem>
+          <ControlItem>{this.renderPreviousButton()}</ControlItem>
+          <ControlItem>{this.renderPlayStopButtons()}</ControlItem>
+          <ControlItem>{this.renderNextButton()}</ControlItem>
           <ControlItem>
             <RepeatDropdown
               repeat={repeat}
diff --git a/src/components/Audioplayer/style.scss b/src/components/Audioplayer/style.scss
index 7e6598504..99ff2a972 100644
--- a/src/components/Audioplayer/style.scss
+++ b/src/components/Audioplayer/style.scss
@@ -8,9 +8,9 @@
   z-index: 1;
   padding: 10px 20px 5px;
   background: #fff;
-  box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .2);
+  box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.2);
   min-width: 340px;
-  @media(max-width: $screen-sm) {
+  @media (max-width: $screen-sm) {
     bottom: 0;
     width: 100%;
   } // border: 0.08333rem solid transparent !important;
@@ -20,7 +20,7 @@
   width: 100%;
   display: inline-block;
   cursor: pointer;
-  padding-right: 1.5%;
+  padding: 0 10px;
   color: $text-color;
   outline: none;
   &:focus,
@@ -53,7 +53,7 @@
 }
 
 .popover {
-   :global(.popover-title) {
+  :global(.popover-title) {
     font-family: $font-montserrat;
     text-transform: uppercase;
     color: $cream;
@@ -61,13 +61,13 @@
     padding-bottom: 15px;
     font-size: 0.75em;
   }
-   :global(.popover-content) {
-     :global(a) {
+  :global(.popover-content) {
+    :global(a) {
       font-size: 0.8em;
     }
   }
   .pill {
-     :global(a) {
+    :global(a) {
       padding: 10px 15px;
     }
   }
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
index 4df6881df..13470fe6f 100644
--- a/src/components/Footer/index.js
+++ b/src/components/Footer/index.js
@@ -147,8 +147,7 @@ const Footer = () => (
                 .
               </p>
               <p className="monserrat">
-                © { new Date().getFullYear() } Quran.com.
-                {' '}
+                © {new Date().getFullYear()} Quran.com.{' '}
                 <LocaleFormattedMessage
                   id="nav.rightsReserved"
                   defaultMessage="All Rights Reserved"
diff --git a/src/components/GlobalNav/Surah/index.js b/src/components/GlobalNav/Surah/index.js
index d802b9792..5c2511390 100644
--- a/src/components/GlobalNav/Surah/index.js
+++ b/src/components/GlobalNav/Surah/index.js
@@ -22,9 +22,9 @@ class GlobalNavSurah extends Component {
   handleVerseDropdownClick = (verseNum) => {
     const { versesIds, chapter } = this.props; // eslint-disable-line no-shadow
 
-    this.props.setCurrentVerse(`${chapter.chapterNumber}:${verseNum}`);
-
     if (versesIds.has(verseNum)) {
+      this.props.setCurrentVerse(`${chapter.chapterNumber}:${verseNum}`);
+
       return false;
     }
 
diff --git a/src/components/GlobalSidebar/index.js b/src/components/GlobalSidebar/index.js
index 09861650e..88df9d58a 100644
--- a/src/components/GlobalSidebar/index.js
+++ b/src/components/GlobalSidebar/index.js
@@ -12,20 +12,20 @@ const NavbarHeader = Navbar.Header;
 const List = styled.ul`
   padding-left: 0;
 
-  li{
+  li {
     color: #777;
 
-    a{
+    a {
       color: #777;
       padding: 10px 15px;
       display: block;
 
-      .ss-icon{
+      .ss-icon {
         font-size: 18px;
         margin-right: 20px;
       }
 
-      &:hover{
+      &:hover {
         background: #f5f5f5;
         color: #333;
       }
diff --git a/src/components/GlobalSidebar/style.scss b/src/components/GlobalSidebar/style.scss
index 07a6ae30a..728184f7b 100644
--- a/src/components/GlobalSidebar/style.scss
+++ b/src/components/GlobalSidebar/style.scss
@@ -1,37 +1,68 @@
 @import '../../styles/variables.scss';
+
 $width: 280px;
-.container {
+
+.container{
   position: fixed;
   left: $width * -1;
   top: 0;
   bottom: 0;
   background: #fff;
   z-index: 1031;
-  box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 16px 24px 2px rgba(0,0,0,0.14), 0 6px 30px 5px rgba(0,0,0,0.12), 0 8px 10px -5px rgba(0,0,0,0.2);
   visibility: hidden;
+
   background: #fff;
   width: $width;
-  transition: left 0.35s cubic-bezier(0.24, 1, 0.32, 1), visibility 0.2s;
-  &.open {
+  transition: left 0.35s cubic-bezier(0.24,1,0.32,1), visibility 0.2s;
+
+  &.open{
     left: 0;
-    visibility: visible;
-    ;
+    visibility: visible;;
   }
-   :global(.navbar-text) {
+
+  :global(.navbar-text){
     margin-left: 0;
-    .backToHome {
-      margin-right: 23px;
-      font-size: 17px;
-    }
+      .backToHome {
+          margin-right: 23px;
+          font-size: 17px;
+      }
   }
+
   @media(max-width: $screen-sm) {
     width: $width;
     left: -1 * $width;
-    &.open {
+
+    &.open{
       left: 0;
     }
-     :global(.navbar-text) {
+
+    :global(.navbar-text){
       padding-left: 15px;
     }
   }
 }
+
+.list{
+  padding-left: 0;
+
+  :global(li){
+    color: #777;
+
+    :global(a){
+      color: #777;
+      padding: 10px 15px;
+      display: block;
+
+      :global(.ss-icon){
+        font-size: 18px;
+        margin-right: 20px;
+      }
+
+      &:hover{
+        background: #f5f5f5;
+        color: #333;
+      }
+    }
+  }
+}
diff --git a/src/components/Home/JuzList/index.js b/src/components/Home/JuzList/index.js
index f61832bcc..39464141a 100644
--- a/src/components/Home/JuzList/index.js
+++ b/src/components/Home/JuzList/index.js
@@ -11,22 +11,40 @@ class JuzList extends Component {
     const juzzChapters = Object.keys(juz.verseMapping);
 
     const list = juzzChapters.map(chapter => (
-      <div className={`col-xs-10 col-xs-offset-2 ${styles.translated_name}`}>
-        <span className={'text-uppercase'}>
-          {chapters[chapter].nameSimple}
-        </span>
-        <span>
-          <Link
-            to={`/${chapter}/${juz.verseMapping[chapter]}`}
-            className={`${styles.link} row`}
+      <div className={`col-md-12 ${styles.translated_name}`}>
+        <Link
+          to={`/${chapter}/${juz.verseMapping[chapter]}`}
+          className={`${styles.link} row`}
+        >
+          <div className="col-xs-9">
+            <span className={styles.chapterName}>
+              {chapters[chapter].nameSimple}
+            </span>
+
+            <span className="h5">
+              <small>{juz.verseMapping[chapter]}</small>
+            </span>
+          </div>
+          <div className={`col-xs-3 text-left ${styles.arabic}`}>
+            <span className={`icon-surah${chapters[chapter].id}`} />
+          </div>
+
+          <div
+            className={`col-xs-10 text-uppercase ${styles.translated_name} ${chapters[chapter].languageName}`}
           >
-            {juz.verseMapping[chapter]}
-          </Link>
-        </span>
+            <small>{chapters[chapter].translatedName.name}</small>
+          </div>
+        </Link>
       </div>
     ));
 
-    return list;
+    return (
+      <div className="col-md-10">
+        <div className="row">
+          {list}
+        </div>
+      </div>
+    );
   }
 
   render() {
@@ -36,14 +54,10 @@ class JuzList extends Component {
     return (
       <ul className="col-md-4 list-unstyled">
         {juzs.map(juz => (
-          <li className={`${styles.item}`} key={juz.juzNumber}>
-            <div className="col-xs-2 text-muted">
+          <li className={`${styles.item} row`} key={juz.juzNumber}>
+            <div className="col-xs-2 col-md-1 text-muted">
               {juz.juzNumber}
             </div>
-            <div className="col-xs-7">
-              {juz.nameArabic}
-              {juz.nameSimple}
-            </div>
             {this.renderJuz(juz)}
           </li>
         ))}
diff --git a/src/components/Home/JuzList/styles.scss b/src/components/Home/JuzList/styles.scss
index e0e170ee4..f0659fa94 100644
--- a/src/components/Home/JuzList/styles.scss
+++ b/src/components/Home/JuzList/styles.scss
@@ -3,19 +3,26 @@
 .item {
   color: $brand-primary;
 
-  &:hover {
-    background: #f1f1f1;
-  }
-
   .link {
     display: block;
     padding: 10px 10px;
+
+    &:hover {
+      background: #f1f1f1;
+    }
   }
 
   .translated_name {
     font-size: 10px;
+    color: #777;
   }
+
   .arabic {
     font-size: 14px;
   }
+
+  .chapterName{
+    margin-right: 5px;
+    font-size: 14px;
+  }
 }
diff --git a/src/components/Home/LastVisit/index.js b/src/components/Home/LastVisit/index.js
index cc966fe07..869241ed3 100644
--- a/src/components/Home/LastVisit/index.js
+++ b/src/components/Home/LastVisit/index.js
@@ -15,13 +15,10 @@ const LastVisit = (props) => {
         <LocaleFormattedMessage
           id="surah.index.continue"
           defaultMessage="Continue"
-        />
-        {' '}
+        />{' '}
         <Link to={`/${props.chapter.chapterNumber}/${props.verse}`}>
           <span>
-            {props.chapter.nameSimple}
-            {' '}
-            (
+            {props.chapter.nameSimple} (
             {props.chapter.chapterNumber}
             :
             {props.verse}
diff --git a/src/components/Home/QuickSurahs/index.js b/src/components/Home/QuickSurahs/index.js
index 8b377ca13..1162b34ab 100644
--- a/src/components/Home/QuickSurahs/index.js
+++ b/src/components/Home/QuickSurahs/index.js
@@ -9,7 +9,8 @@ const Span = styled.span`
   &:after {
     content: '|';
   }
-  &:first-child, &:last-child {
+  &:first-child,
+  &:last-child {
     &:after {
       content: none;
     }
@@ -25,7 +26,7 @@ export default () => (
         id="surah.index.quickLinks"
         defaultMessage="Quick links"
       />
-      {isFriday &&
+      {isFriday && (
         <Span>
           <Link
             to="/18"
@@ -34,7 +35,8 @@ export default () => (
           >
             Surah Al-Kahf
           </Link>
-        </Span>}
+        </Span>
+      )}
       <Span>
         <Link
           to="/36"
diff --git a/src/components/Home/SurahsList/index.js b/src/components/Home/SurahsList/index.js
index cf8439f5d..70daa90ea 100644
--- a/src/components/Home/SurahsList/index.js
+++ b/src/components/Home/SurahsList/index.js
@@ -11,12 +11,11 @@ const Item = styled.li`
   }
 `;
 
-const Arabic = styled.div`
-  font-size: 14px;
-`;
+const Arabic = styled.div`font-size: 14px;`;
 
 const Translated = styled.div`
   font-size: 10px;
+  color: #777;
 `;
 
 const StyledLink = styled(Link)`
@@ -29,19 +28,16 @@ const SurahsList = props => (
     {props.chapters.map(chapter => (
       <Item key={chapter.id}>
         <StyledLink to={`/${chapter.id}`} className="row">
-          <div className="col-xs-2 text-muted">
-            {chapter.chapterNumber}
-          </div>
-          <div className="col-xs-7">
-            {chapter.nameSimple}
-          </div>
+          <div className="col-xs-2 text-muted">{chapter.chapterNumber}</div>
+          <div className="col-xs-7">{chapter.nameSimple}</div>
           <Arabic className="col-xs-3 text-left">
             <span className={`icon-surah${chapter.id}`} />
           </Arabic>
 
           <Translated className="col-xs-10 col-xs-offset-2">
             <span
-              className={`text-uppercase ${chapter.translatedName.languageName}`}
+              className={`text-uppercase ${chapter.translatedName
+                .languageName}`}
             >
               {chapter.translatedName.name}
             </span>
diff --git a/src/components/Settings/TranslationsDropdown/index.js b/src/components/Settings/TranslationsDropdown/index.js
index b034f13e9..e627b401c 100644
--- a/src/components/Settings/TranslationsDropdown/index.js
+++ b/src/components/Settings/TranslationsDropdown/index.js
@@ -101,16 +101,18 @@ class TranslationsDropdown extends Component {
       <MenuItem
         icon={<Icon type="list" />}
         menu={
-          translationOptions.length
-            ? <Menu>
-              {translations && translations.length
-                  ? <MenuItem onClick={this.handleRemoveContent}>
-                    <LocaleFormattedMessage
-                      id="setting.translations.removeAll"
-                      defaultMessage="Remove all"
-                    />
-                  </MenuItem>
-                  : <span />}
+          translationOptions.length ? (
+            <Menu>
+              {translations && translations.length ? (
+                <MenuItem onClick={this.handleRemoveContent}>
+                  <LocaleFormattedMessage
+                    id="setting.translations.removeAll"
+                    defaultMessage="Remove all"
+                  />
+                </MenuItem>
+              ) : (
+                <span />
+              )}
               <MenuItem divider>
                 <LocaleFormattedMessage
                   id="setting.translations.english"
@@ -126,7 +128,9 @@ class TranslationsDropdown extends Component {
               </MenuItem>
               {this.renderLanguagesList()}
             </Menu>
-            : <Loader isActive />
+          ) : (
+            <Loader isActive />
+          )
         }
       >
         <LocaleFormattedMessage
diff --git a/src/components/SurahsDropdown/index.js b/src/components/SurahsDropdown/index.js
index 0cc05d8ef..59c2a3c20 100644
--- a/src/components/SurahsDropdown/index.js
+++ b/src/components/SurahsDropdown/index.js
@@ -24,9 +24,7 @@ class SurahsDropdown extends Component {
         <MenuItem>
           <div className="row">
             <div className="col-xs-2 col-md-2">
-              <span className="chapter-num">
-                {chapter.chapterNumber}
-              </span>
+              <span className="chapter-num">{chapter.chapterNumber}</span>
             </div>
             <div className="col-xs-7 col-md-7">
               <span className="suran-name">{chapter.nameSimple}</span>
@@ -51,15 +49,15 @@ class SurahsDropdown extends Component {
 
     return (
       <NavDropdown
-        link
         className={styles.dropdown}
         id="chapters-dropdown"
         title={
-          chapter.nameSimple ||
+          chapter.nameSimple || (
             <LocaleFormattedMessage
               id="setting.chapters"
               defaultMessage="Surahs"
             />
+          )
         }
       >
         {this.renderList()}
@@ -70,7 +68,7 @@ class SurahsDropdown extends Component {
 
 SurahsDropdown.propTypes = {
   chapters: customPropTypes.chapters.isRequired,
-  chapter: customPropTypes.chapters.isRequired
+  chapter: customPropTypes.surahType.isRequired
 };
 
 export default SurahsDropdown;
diff --git a/src/components/TopOptions/index.js b/src/components/TopOptions/index.js
index 9edb7203a..a258f4d8d 100644
--- a/src/components/TopOptions/index.js
+++ b/src/components/TopOptions/index.js
@@ -15,7 +15,9 @@ const TopOptions = ({ title, chapter }) => (
     </div>
     <div className="col-md-8 text-right">
       <ul className="list-inline">
-        <li><Share chapter={chapter} /></li>
+        <li>
+          <Share chapter={chapter} />
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/components/Verse/index.js b/src/components/Verse/index.js
index 98d5ab310..9671fbe14 100644
--- a/src/components/Verse/index.js
+++ b/src/components/Verse/index.js
@@ -61,13 +61,13 @@ class Verse extends Component {
     const { verse, match } = this.props;
     const array = match || verse.translations || [];
 
-    return array.map(translation =>
+    return array.map(translation => (
       <Translation
         translation={translation}
         index={translation.id}
         key={translation.id}
       />
-    );
+    ));
   }
 
   renderMedia() {
@@ -78,7 +78,7 @@ class Verse extends Component {
 
     return (
       <div>
-        {verse.mediaContents.map((content, index) =>
+        {verse.mediaContents.map((content, index) => (
           <div className={`${styles.translation} translation`} key={index}>
             <h2 className="text-translation times-new">
               <small>
@@ -100,7 +100,7 @@ class Verse extends Component {
               </small>
             </h2>
           </div>
-        )}
+        ))}
       </div>
     );
   }
@@ -118,7 +118,7 @@ class Verse extends Component {
     let wordAudioPosition = -1;
     const renderText = false; // userAgent.isBot;
 
-    const text = verse.words.map(word =>
+    const text = verse.words.map(word => (
       <Word
         word={word}
         key={`${word.position}-${word.code}-${word.lineNum}`}
@@ -132,13 +132,11 @@ class Verse extends Component {
         isSearched={isSearched}
         useTextFont={renderText}
       />
-    );
+    ));
 
     return (
       <h1 className={`${styles.font} text-right text-arabic`}>
-        <p>
-          {text}
-        </p>
+        <p>{text}</p>
       </h1>
     );
   }
diff --git a/src/components/VersesDropdown/index.js b/src/components/VersesDropdown/index.js
index ac491dd75..4c6746321 100644
--- a/src/components/VersesDropdown/index.js
+++ b/src/components/VersesDropdown/index.js
@@ -57,7 +57,6 @@ class VersesDropdown extends Component {
 
     return (
       <NavDropdown
-        link
         className={`dropdown ${className} ${style.dropdown}`}
         id="verses-dropdown"
         title={title}
diff --git a/src/config.js b/src/config.js
index b47498910..5b3c57055 100644
--- a/src/config.js
+++ b/src/config.js
@@ -8,14 +8,15 @@ const environment = {
 }[process.env.NODE_ENV || 'development'];
 
 const title = "Al-Qur'an al-Kareem - القرآن الكريم";
-const description = 'The Quran translated into many languages in a simple and easy interface.';
+const description =
+  'The Quran translated into many languages in a simple and easy interface.';
 const keywords = [
   'القران الكريم',
   'قران كريم',
   'القرآن',
   'قران',
   'quran',
-  'qur\'an',
+  "qur'an",
   'koran',
   'kareem',
   'surah',
@@ -86,7 +87,8 @@ const config = {
         },
         {
           name: 'viewport',
-          content: 'width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
+          content:
+            'width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
         },
         {
           name: 'google-site-verification',
@@ -317,7 +319,8 @@ const config = {
       /* SEO: https://developers.google.com/structured-data/site-name#markup_requirements */
       script: [
         {
-          src: 'https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.en',
+          src:
+            'https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.en',
           async: '',
           defer: ''
         },
diff --git a/src/containers/About/index.js b/src/containers/About/index.js
index 794a13f6c..e91f8d3cf 100644
--- a/src/containers/About/index.js
+++ b/src/containers/About/index.js
@@ -10,15 +10,14 @@ export default () => (
       <div className="row">
         <div className="col-md-8 col-md-offset-2">
           <h4 className="source-sans">
-            The Noble Qur&apos;an is the central
-            religious text of Islam. Muslims believe the Qur’an is the
-            book of Divine guidance and direction for mankind, and
-            consider the original Arabic text the final revelation of
-            Allah (God).[<a href="en.wikipedia.org/wiki/Quran">1</a>]
-            All translations of the original Arabic text
-            are thus interpretations of the original meanings and should
-            be embraced as such. For more information about the Noble
-            Qur&apos;an, you may visit its <a href="https://en.wikipedia.org/wiki/Quran">Wikipedia article.</a>
+            The Noble Qur’an is the central religious text of Islam. Muslims
+            believe the Qur’an is the book of Divine guidance and direction for
+            mankind, and consider the original Arabic text the final revelation
+            of Allah (God).[<a href="en.wikipedia.org/wiki/Quran">1</a>] All
+            translations of the original Arabic text are thus interpretations of
+            the original meanings and should be embraced as such. For more
+            information about the Noble Qur’an, you may visit its{' '}
+            <a href="https://en.wikipedia.org/wiki/Quran">Wikipedia article.</a>
           </h4>
         </div>
       </div>
@@ -26,12 +25,11 @@ export default () => (
         <div className="col-md-8 col-md-offset-2">
           <h3>MECCAN SURAHS</h3>
           <h4 className="source-sans">
-            The Meccan Surahs are the chronologically earlier chapters
-            (Surahs) of the Qur&apos;an that were, according to Islamic
-            tradition, revealed anytime before the migration of the
-            Islamic prophet Muhammed and his followers from Mecca to
-            Medina (Hijra). The Medinan Surahs are those revelations that
-            occurred after the move to the city of that name.
+            The Meccan Surahs are the chronologically earlier chapters (Surahs)
+            of the Qur’an that were, according to Islamic tradition, revealed
+            anytime before the migration of the Islamic prophet Muhammed and his
+            followers from Mecca to Medina (Hijra). The Medinan Surahs are those
+            revelations that occurred after the move to the city of that name.
           </h4>
         </div>
       </div>
@@ -39,45 +37,52 @@ export default () => (
         <div className="col-md-8 col-md-offset-2">
           <h3>MEDINAN SURAHS</h3>
           <h4 className="source-sans">
-            The Medinan Surahs or Medinan Chapters of the Qur&apos;an are the
-            latest 24 Surahs that, according to Islamic tradition, were
-            revealed at Medina after Muhammad&apos;s Hijra from Mecca. These
-            Surahs were revealed by Allah when the Muslim community was
-            larger and more developed, as opposed to their minority position
-            in Mecca.
+            The Medinan Surahs or Medinan Chapters of the Qur’an are the latest
+            24 Surahs that, according to Islamic tradition, were revealed at
+            Medina after Muhammad’s Hijra from Mecca. These Surahs were revealed
+            by Allah when the Muslim community was larger and more developed, as
+            opposed to their minority position in Mecca.
           </h4>
         </div>
       </div>
+
       <div className="row">
         <div className="col-md-8 col-md-offset-2">
           <h3>BROWSING SURAHS ON THIS WEBSITE</h3>
           <h4 className="source-sans">
             We have redesigned the website with a user friendly approach in
-            mind. To browse through the Surahs, click on the button
-            (shown left) in the READ & LISTEN page and navigate Surah by
-            title or by page. In future iterations, we will be integrating
-            more search and audio features, ان شاء الله. If you have any
-            suggestions on how we can make the website a better experience
-            please do not hesitate to <a href="https://quran.zendesk.com/hc/en-us">contact us</a>.
+            mind. To browse through the Surahs, click on the button (shown left)
+            in the READ & LISTEN page and navigate Surah by title or by page. In
+            future iterations, we will be integrating more search and audio
+            features, ان شاء الله. If you have any suggestions on how we can
+            make the website a better experience please do not hesitate to{' '}
+            <a href="https://quran.zendesk.com/hc/en-us">contact us</a>
+            .
           </h4>
         </div>
       </div>
       <div className="row credits">
         <div className="col-md-8 col-md-offset-2">
-          <h3><strong>CREDITS</strong></h3>
+          <h3>
+            <strong>CREDITS</strong>
+          </h3>
           <h4>
-            This website was created by a few volunteers and was made
-            possible with the will of Allah (Glory be unto Him) and with the
-            help of the open source Muslim community online. Data sources
-            include <a href="http://www.tanzil.info">Tanzil</a>,
-            <a href="http://www.qurancomplex.com"> Qur&apos;anComplex</a>,
-            <a href="https://github.com/cpfair/quran-align"> Colin Fair&apos;s work on audio segments</a>,
+            This website was created by a few volunteers and was made possible
+            with the will of Allah (Glory be unto Him) and with the help of the
+            open source Muslim community online. Data sources include{' '}
+            <a href="http://www.tanzil.info">Tanzil</a>,
+            <a href="http://www.qurancomplex.com"> Qur‘anComplex</a>,
+            <a href="https://github.com/cpfair/quran-align">
+              {' '}
+              Colin Fair’s work on audio segments
+            </a>
+            ,
             <a href="http://www.zekr.org"> Zekr</a> and
-            <a href="http://www.al-quran.info"> Online Qur&apos;an Project</a>.
+            <a href="http://www.al-quran.info"> Online Qur’an Project</a>.
             Special thanks to the
-            <a href="http://elmohafez.com"> Elmohafez team</a> for word by
-            word timing files.
-            If you have any questions, you may visit the <a href="/contact">Contact</a> page.
+            <a href="http://elmohafez.com"> Elmohafez team</a> for word by word
+            timing files. If you have any questions, you may visit the{' '}
+            <a href="/contact">Contact</a> page.
           </h4>
         </div>
       </div>
diff --git a/src/containers/AyatulKursi/index.js b/src/containers/AyatulKursi/index.js
index d95b6c9fa..0606557d2 100644
--- a/src/containers/AyatulKursi/index.js
+++ b/src/containers/AyatulKursi/index.js
@@ -50,9 +50,10 @@ const TopOptions = Loadable({
 });
 
 const title = 'Ayatul Kursi';
-const description = 'Ayatul Kursi is verse 255 of the second chapter, ' +
-                    'Surah al-Baqarah (The Chapter of the Cow), in the ' +
-                    'Holy Quran. It is also known as the Throne Verse.';
+const description =
+  'Ayatul Kursi is verse 255 of the second chapter, ' +
+  'Surah al-Baqarah (The Chapter of the Cow), in the ' +
+  'Holy Quran. It is also known as the Throne Verse.';
 
 class AyatulKursi extends Component {
   state = {
@@ -109,13 +110,7 @@ class AyatulKursi extends Component {
   }
 
   renderLines() {
-    const {
-      lines,
-      options,
-      currentVerse,
-      isPlaying,
-      actions
-    } = this.props;
+    const { lines, options, currentVerse, isPlaying, actions } = this.props;
     const keys = Object.keys(lines);
 
     return (
@@ -131,11 +126,7 @@ class AyatulKursi extends Component {
   }
 
   render() {
-    const {
-      chapter,
-      verses,
-      options
-    } = this.props; // eslint-disable-line no-shadow
+    const { chapter, verses, options } = this.props; // eslint-disable-line no-shadow
     debug('component:AyatulKursi', 'Render');
 
     return (
@@ -171,15 +162,18 @@ class AyatulKursi extends Component {
           ]}
           style={[
             {
-              cssText: `.text-arabic{font-size: ${options.fontSize.arabic}rem;} .text-translation{font-size: ${options.fontSize.translation}rem;}` // eslint-disable-line max-len
+              cssText: `.text-arabic{font-size: ${options.fontSize
+                .arabic}rem;} .text-translation{font-size: ${options.fontSize
+                .translation}rem;}` // eslint-disable-line max-len
             }
           ]}
         />
         <div className={`container-fluid ${style.container}`}>
           <div className="row">
             <div className="col-md-10 col-md-offset-1">
-              {__CLIENT__ &&
-                <TopOptions title="Ayatul Kursi" chapter={chapter} />}
+              {__CLIENT__ && (
+                <TopOptions title="Ayatul Kursi" chapter={chapter} />
+              )}
               <Bismillah chapter={chapter} />
               {options.isReadingMode ? this.renderLines() : this.renderVerses()}
             </div>
@@ -197,12 +191,13 @@ class AyatulKursi extends Component {
             </div>
           </div>
         </div>
-        {__CLIENT__ &&
+        {__CLIENT__ && (
           <Audioplayer
             chapter={chapter}
             startVerse={Object.values(verses)[0]}
             onLoadAyahs={this.handleLazyLoadAyahs}
-          />}
+          />
+        )}
       </div>
     );
   }
diff --git a/src/containers/Contact/index.js b/src/containers/Contact/index.js
index 65cb7094d..85440fb46 100644
--- a/src/containers/Contact/index.js
+++ b/src/containers/Contact/index.js
@@ -21,20 +21,25 @@ class Contact extends Component {
       }
     };
 
-    superagent.post('/support').send(form).end((err, { body }) => {
-      if (body.ticket) {
-        this.setState({
-          success: true
-        });
-      }
-    });
+    superagent
+      .post('/support')
+      .send(form)
+      .end((err, { body }) => {
+        if (body.ticket) {
+          this.setState({
+            success: true
+          });
+        }
+      });
   };
 
   renderForm() {
     return (
       <form className="form-horizontal" onSubmit={this.submitSupport}>
         <div className="form-group">
-          <label htmlFor="name" className="col-sm-2 control-label">Name</label>
+          <label htmlFor="name" className="col-sm-2 control-label">
+            Name
+          </label>
           <div className="col-sm-8">
             <input
               type="text"
@@ -110,9 +115,9 @@ class Contact extends Component {
 
   renderSubmitSuccess = () => (
     <h3 className="text-center form-success-message">
-      Thank you for contacting us - we look forward to speaking with you. While this is a
-      volunteer effort, we do experience many support tickets on a daily basis and would
-      love to get back to everyone on a timely manner.
+      Thank you for contacting us - we look forward to speaking with you. While
+      this is a volunteer effort, we do experience many support tickets on a
+      daily basis and would love to get back to everyone on a timely manner.
     </h3>
   );
 
@@ -132,16 +137,14 @@ class Contact extends Component {
           <div className="row">
             <div className="col-md-6 col-md-offset-3">
               <h4>
-                Contacting us - thank you for taking time to speak to us.
-                Please be as concise as possible and include screenshots
-                where applicable to help us help you as quickly as we can.
+                Contacting us - thank you for taking time to speak to us. Please
+                be as concise as possible and include screenshots where
+                applicable to help us help you as quickly as we can.
                 <br />
                 <br />
               </h4>
             </div>
-            <div className="col-md-8 col-md-offset-2">
-              {body}
-            </div>
+            <div className="col-md-8 col-md-offset-2">{body}</div>
           </div>
         </div>
       </div>
diff --git a/src/containers/Donations/index.js b/src/containers/Donations/index.js
index fce7520da..4ea216d00 100644
--- a/src/containers/Donations/index.js
+++ b/src/containers/Donations/index.js
@@ -13,41 +13,43 @@ export default () => (
           <h3>Who we are.</h3>
           <p>
             Since 2008, Alhamdulillah Quran.com now serves over 3.1 million
-            visits from all corners of the world - and we continue to grow everyday.
-            <br /><br />
-            This, with the blessing of Allah, is powered by merely 5 volunteers who are
-            working hard on their spare time to keep this project as beneficial and useful
-            to people all around the world.
+            visits from all corners of the world - and we continue to grow
+            everyday.
+            <br />
+            <br />
+            This, with the blessing of Allah, is powered by merely 5 volunteers
+            who are working hard on their spare time to keep this project as
+            beneficial and useful to people all around the world.
           </p>
           <h3>How you can help.</h3>
           <p>
-            Quran.com has an incredible amount of potential from a product standpoint
-            and a team standpoint. We need to continue innovating the product and the
-            experience to serve you better. To do so we have overhead costs which include:
+            Quran.com has an incredible amount of potential from a product
+            standpoint and a team standpoint. We need to continue innovating the
+            product and the experience to serve you better. To do so we have
+            overhead costs which include:
           </p>
           <ul>
-            <li>
-              Server costs.
-            </li>
+            <li>Server costs.</li>
             <li>
               Data analytics and metrics tools to best learn about your needs
               (Optimizely, Heap, Keen, etc.).
             </li>
             <li>
-              Design help (we are striving to follow our beautiful religion
-              by making beautiful products).
+              Design help (we are striving to follow our beautiful religion by
+              making beautiful products).
             </li>
           </ul>
           <h3>Make a difference.</h3>
           <p>
-            Making a difference for Quran.com is as simple as a Tweet, Facebook share or
-            emailing us feedback. For those looking to make a stronger impact, support us by
-            contributing any monetary amount.
+            Making a difference for Quran.com is as simple as a Tweet, Facebook
+            share or emailing us feedback. For those looking to make a stronger
+            impact, support us by contributing any monetary amount.
           </p>
         </div>
 
         <div className="col-md-4 col-md-offset-4 text-center">
-          <br /><br />
+          <br />
+          <br />
           <a
             target="_blank"
             rel="noopener noreferrer"
@@ -56,9 +58,12 @@ export default () => (
           >
             Support Quran.com
           </a>
-          <br /><br />
-          If you have any questions, please do not hesitate to contact
-          us at <a href="mailto:support@quran.zendesk.com">support@quran.zendesk.com.</a>
+          <br />
+          <br />
+          If you have any questions, please do not hesitate to contact us at{' '}
+          <a href="mailto:support@quran.zendesk.com">
+            support@quran.zendesk.com.
+          </a>
         </div>
       </div>
     </div>
diff --git a/src/containers/Home/index.js b/src/containers/Home/index.js
index 4c2c98b68..c12852024 100644
--- a/src/containers/Home/index.js
+++ b/src/containers/Home/index.js
@@ -49,9 +49,9 @@ class Home extends Component {
 
     return (
       <div className="row">
-        <JuzList chapters={chapters} juzs={juzList.slice(0, 10)} />
-        <JuzList chapters={chapters} juzs={juzList.slice(10, 20)} />
-        <JuzList chapters={chapters} juzs={juzList.slice(20, 30)} />
+        <JuzList chapters={chapters} juzs={juzList.slice(0, 20)} />
+        <JuzList chapters={chapters} juzs={juzList.slice(20, 28)} />
+        <JuzList chapters={chapters} juzs={juzList.slice(28, 30)} />
       </div>
     );
   }
@@ -96,11 +96,12 @@ class Home extends Component {
         <div className="container">
           <div className="row">
             <div className="col-md-10 col-md-offset-1">
-              {lastVisit &&
+              {lastVisit && (
                 <LastVisit
                   chapter={chapters[lastVisit.chapterId]}
                   verse={lastVisit.verseId}
-                />}
+                />
+              )}
               <QuickSurahs />
 
               <Tabs>
@@ -108,9 +109,7 @@ class Home extends Component {
                   {this.renderChapterList(chaptersList)}
                 </Tab>
 
-                <Tab title={juzTitle}>
-                  {this.renderJuzList()}
-                </Tab>
+                <Tab title={juzTitle}>{this.renderJuzList()}</Tab>
               </Tabs>
             </div>
           </div>
diff --git a/src/containers/MobileLanding/index.js b/src/containers/MobileLanding/index.js
index e4fbc78ac..378791a3c 100644
--- a/src/containers/MobileLanding/index.js
+++ b/src/containers/MobileLanding/index.js
@@ -20,14 +20,12 @@ const Container = styled.div`
   min-height: 100vh;
   padding-top: 15%;
 
-  & + footer{
+  & + footer {
     margin-top: 0;
   }
 `;
 
-const Title = styled.h1`
-  color: #000000;
-`;
+const Title = styled.h1`color: #000000;`;
 
 export default () => (
   <Container className="montserrat container">
@@ -40,16 +38,15 @@ export default () => (
     <div className="row">
       <div className="col-md-5">
         <Title>
-          <strong>Quran</strong><br />
+          <strong>Quran</strong>
+          <br />
           by quran.com القرآن
         </Title>
         <h3>
           <small>
-            From the makers of Quran.com comes Quran for iOS, a beautiful,{' '}
-            and ad-free mushaf app.
-            It’s now easier to read the Quran on the go, memorize it and listen to your
-            {' '}
-            favorite reciters.
+            From the makers of Quran.com comes Quran for iOS, a beautiful, and
+            ad-free mushaf app. It’s now easier to read the Quran on the go,
+            memorize it and listen to your favorite reciters.
           </small>
         </h3>
         <div className="row" style={{ paddingTop: 15 }}>
diff --git a/src/containers/MobileLanding/style.scss b/src/containers/MobileLanding/style.scss
index db716ece6..bb50cfbf1 100644
--- a/src/containers/MobileLanding/style.scss
+++ b/src/containers/MobileLanding/style.scss
@@ -1,9 +1,30 @@
 @import '../../styles/variables.scss';
-.button {
+
+.container{
+  min-height: 500px;
+  min-height: 100vh;
+  padding-top: 15%;
+
+  & + footer{
+    margin-top: 0;
+  }
+}
+
+.title{
+  color: #000000;
+}
+
+.button{
   border-radius: 50px;
-  @media(max-width: $screen-sm) {
-    &:last-child {
+
+  @media(max-width: $screen-sm){
+    &:last-child{
       margin-top: 15px;
     }
   }
 }
+
+.icons{
+  height: 18px;
+  padding-right: 5px;
+}
diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js
index 79a22cb66..190a57917 100644
--- a/src/containers/Surah/index.js
+++ b/src/containers/Surah/index.js
@@ -205,13 +205,17 @@ class Surah extends Component {
       const verse = verses[`${chapter.chapterNumber}:${params.range}`];
 
       if (verse && verse.content && verse.content[0]) {
-        return `Surat ${chapter.nameSimple} [verse ${params.range}] - ${verse.content[0].text}`;
+        return `Surat ${chapter.nameSimple} [verse ${params.range}] - ${verse
+          .content[0].text}`;
       }
 
       return `Surat ${chapter.nameSimple} [verse ${params.range}]`;
     }
 
-    return `${info ? info.shortText : ''} This Surah has ${chapter.versesCount} verses and resides between pages ${chapter.pages[0]} to ${chapter.pages[1]} in the Quran.`; // eslint-disable-line max-len
+    return `${info
+      ? info.shortText
+      : ''} This Surah has ${chapter.versesCount} verses and resides between pages ${chapter
+      .pages[0]} to ${chapter.pages[1]} in the Quran.`; // eslint-disable-line max-len
   }
 
   renderNoAyah() {
@@ -228,9 +232,11 @@ class Surah extends Component {
       </div>
     );
 
-    return isLoading
-      ? <Loader isActive relative style={LoaderStyle} />
-      : noAyah;
+    return isLoading ? (
+      <Loader isActive relative style={LoaderStyle} />
+    ) : (
+      noAyah
+    );
   }
 
   renderPagination() {
@@ -246,9 +252,10 @@ class Surah extends Component {
 
     // If single verse, eh. /2/30
     if (isSingleAyah) {
-      const to = this.getFirst() + 10 > chapter.versesCount
-        ? chapter.versesCount
-        : this.getFirst() + 10;
+      const to =
+        this.getFirst() + 10 > chapter.versesCount
+          ? chapter.versesCount
+          : this.getFirst() + 10;
 
       return (
         <ul className="pager">
@@ -273,10 +280,11 @@ class Surah extends Component {
         isLoading={isLoading}
         endComponent={
           <ul className="pager">
-            {chapter.chapterNumber > 1 &&
+            {chapter.chapterNumber > 1 && (
               <li className="previous">
                 <Link
-                  to={`/${chapter.chapterNumber * 1 - 1}?translations=${translations}`}
+                  to={`/${chapter.chapterNumber * 1 -
+                    1}?translations=${translations}`}
                 >
                   ←
                   <LocaleFormattedMessage
@@ -284,7 +292,8 @@ class Surah extends Component {
                     defaultMessage="Previous Surah"
                   />
                 </Link>
-              </li>}
+              </li>
+            )}
             <li className="text-center">
               <Link
                 to={`/${chapter.chapterNumber}?translations=${translations}`}
@@ -299,10 +308,11 @@ class Surah extends Component {
                 />
               </Link>
             </li>
-            {chapter.chapterNumber < 114 &&
+            {chapter.chapterNumber < 114 && (
               <li className="next">
                 <Link
-                  to={`/${chapter.chapterNumber * 1 + 1}?translations=${translations}`}
+                  to={`/${chapter.chapterNumber * 1 +
+                    1}?translations=${translations}`}
                 >
                   <LocaleFormattedMessage
                     id="chapter.next"
@@ -310,12 +320,11 @@ class Surah extends Component {
                   />
                   →
                 </Link>
-              </li>}
+              </li>
+            )}
           </ul>
         }
-        loadingComponent={
-          <Loader isActive={isLoading} relative style={LoaderStyle} />
-        }
+        loadingComponent={<Loader isActive={isLoading} style={LoaderStyle} />}
       />
     );
   }
@@ -420,7 +429,9 @@ class Surah extends Component {
           ]}
           style={[
             {
-              cssText: `.text-arabic{font-size: ${options.fontSize.arabic}rem;} .text-translation{font-size: ${options.fontSize.translation}rem;}` // eslint-disable-line max-len
+              cssText: `.text-arabic{font-size: ${options.fontSize
+                .arabic}rem;} .text-translation{font-size: ${options.fontSize
+                .translation}rem;}` // eslint-disable-line max-len
             }
           ]}
         />
@@ -443,13 +454,14 @@ class Surah extends Component {
             </div>
           </div>
         </div>
-        {__CLIENT__ &&
+        {__CLIENT__ && ( // eslint-disable-line
           <Audioplayer
             chapter={chapter}
             verses={verses}
             currentVerse={verses[currentVerse]}
             onLoadAyahs={this.handleLazyLoadAyahs}
-          />}
+          />
+        )}
       </div>
     );
   }
diff --git a/src/helpers/StringHelpers.js b/src/helpers/StringHelpers.js
index ca6f13e63..dba660fec 100644
--- a/src/helpers/StringHelpers.js
+++ b/src/helpers/StringHelpers.js
@@ -1,5 +1,5 @@
 export function zeroPad(num, places, padChar = '0') {
-  const zero = (places - num.toString().length) + 1;
+  const zero = places - num.toString().length + 1;
 
   return Array(+(zero > 0 && zero)).join(padChar) + num;
 }
diff --git a/src/helpers/setLocal.js b/src/helpers/setLocal.js
index 49ee25fe8..374b090b9 100644
--- a/src/helpers/setLocal.js
+++ b/src/helpers/setLocal.js
@@ -20,7 +20,7 @@ export default (req) => {
 
   cookie.save('currentLocale', currentLocal, {
     path: '/',
-    expires: new Date(expireDate),
+    expires: new Date(expireDate)
   });
 
   const localeData = require('../locale/' + currentLocal + '.js'); // eslint-disable-line
diff --git a/src/helpers/tafsirs.js b/src/helpers/tafsirs.js
index 7a88ad0eb..b1006aa29 100644
--- a/src/helpers/tafsirs.js
+++ b/src/helpers/tafsirs.js
@@ -1,10 +1,13 @@
-export const buildTafsirList = (tafsirs, verse) => { // eslint-disable-line
+export const buildTafsirList = (tafsirs, verse) => {
+  // eslint-disable-line
   const verseLink = `/${verse.chapterId}/${verse.verseNumber}`;
-  const list = tafsirs.map((tafsir) => {
-    const url = `${verseLink}/tafsirs/${tafsir.slug || tafsir.id}`;
-    const link = `<a href=${url}>${tafsir.name}</a>`;
-    return `<li>${link}</li>`;
-  }).join('');
+  const list = tafsirs
+    .map((tafsir) => {
+      const url = `${verseLink}/tafsirs/${tafsir.slug || tafsir.id}`;
+      const link = `<a href=${url}>${tafsir.name}</a>`;
+      return `<li>${link}</li>`;
+    })
+    .join('');
 
   return `<ul>${list}</ul>`;
 };
diff --git a/src/locale/ar.js b/src/locale/ar.js
index d96810a38..a68463089 100644
--- a/src/locale/ar.js
+++ b/src/locale/ar.js
@@ -31,7 +31,8 @@ export default {
     'ayah.notFound': 'لم يتم العثور على الآية',
 
     'search.placeholder': 'بحث',
-    'search.resultHeading': '{from}-{to} OF <span> {total} </span> SEARCH RESULTS FOR: <span>{query}</span>', // eslint-disable-line max-len
+    'search.resultHeading':
+      '{from}-{to} OF <span> {total} </span> SEARCH RESULTS FOR: <span>{query}</span>', // eslint-disable-line max-len
     'search.error': 'آسف، كان هناك خطأ مع بحثك.',
     'search.nothing': 'لا استعلام البحث',
     'search.noResult': 'لا توجد نتائج.ا',
@@ -55,7 +56,8 @@ export default {
     'player.repeat.rangeEnd': 'إلى',
     'player.repeat.times': 'مرات',
     'player.repeat.loop': 'أنشوطة',
-    'player.scrollButtonTip': 'مخطوطات تلقائيا إلى يلعب حاليا الآية على التحولات ...',
+    'player.scrollButtonTip':
+      'مخطوطات تلقائيا إلى يلعب حاليا الآية على التحولات ...',
 
     'app.loading': 'جار التحميل ...',
     'actions.copy': 'نسخ',
@@ -72,7 +74,8 @@ export default {
     'nav.otherLinks': 'روابط اخرى',
     'nav.contactUs': 'اتصل بنا',
     'nav.help': 'مساعدة وتعليقات',
-    'nav.aboutQuranProject': 'Quran.com المعروف أيضا باسم القرآن الكريم، قناة القرآن الكريم، القرآن الكريم، القرآن الكريم) هو مشروع خيري)', // eslint-disable-line max-len
+    'nav.aboutQuranProject':
+      'Quran.com المعروف أيضا باسم القرآن الكريم، قناة القرآن الكريم، القرآن الكريم، القرآن الكريم) هو مشروع خيري)', // eslint-disable-line max-len
     'nav.rightsReserved': 'كل الحقوق محفوظة',
     'nav.mobile': 'التليفون المحمول',
     'nav.navigate': 'انتقل',
@@ -80,8 +83,11 @@ export default {
 
     'juz.index.heading': 'الجوز',
 
-    'login.message': 'تسجيل الدخول إلى Quran.com لتخزين كل ما تبذلونه من العناوين والملاحظات والأنشطة.',
-    'error.invalid-surah': "السورة خارج النطاق. الرجاء الانتقال إلى <a href='/'> الصفحة الرئيسية </a> وتحديد سورة",
-    'error.invalid-ayah': "آية خارج النطاق. الرجاء الانتقال إلى <a href='/'> الصفحة الرئيسية </a> وتحديد سورة / آية"
+    'login.message':
+      'تسجيل الدخول إلى Quran.com لتخزين كل ما تبذلونه من العناوين والملاحظات والأنشطة.',
+    'error.invalid-surah':
+      "السورة خارج النطاق. الرجاء الانتقال إلى <a href='/'> الصفحة الرئيسية </a> وتحديد سورة",
+    'error.invalid-ayah':
+      "آية خارج النطاق. الرجاء الانتقال إلى <a href='/'> الصفحة الرئيسية </a> وتحديد سورة / آية"
   }
 };
diff --git a/src/locale/en.js b/src/locale/en.js
index 5d9cf3d02..8e24b9eef 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -31,7 +31,8 @@ export default {
     'ayah.notFound': 'Ayah not found',
 
     'search.placeholder': 'Search "Noah"',
-    'search.resultHeading': '{from}-{to} OF <span> {total} </span> SEARCH RESULTS FOR: <span>{query}</span>', // eslint-disable-line max-len
+    'search.resultHeading':
+      '{from}-{to} OF <span> {total} </span> SEARCH RESULTS FOR: <span>{query}</span>', // eslint-disable-line max-len
     'search.error': 'Sorry, there was an error with your search.',
     'search.nothing': 'No search query.',
     'search.noResult': 'No results found.',
@@ -55,7 +56,8 @@ export default {
     'player.repeat.rangeEnd': 'To',
     'player.repeat.times': 'Times',
     'player.repeat.loop': 'loop',
-    'player.scrollButtonTip': 'Automatically scrolls to the currently playing ayah', // eslint-disable-line max-len
+    'player.scrollButtonTip':
+      'Automatically scrolls to the currently playing ayah', // eslint-disable-line max-len
 
     'app.loading': 'Loading...',
     'actions.copy': 'Copy',
@@ -72,7 +74,8 @@ export default {
     'nav.otherLinks': 'Other links',
     'nav.contactUs': 'Contact us',
     'nav.help': 'Help & feedback',
-    'nav.aboutQuranProject': 'Quran.com (also known as The Noble Quran, Al Quran, Holy Quran, Koran) is a pro bono project.', // eslint-disable-line max-len
+    'nav.aboutQuranProject':
+      'Quran.com (also known as The Noble Quran, Al Quran, Holy Quran, Koran) is a pro bono project.', // eslint-disable-line max-len
     'nav.rightsReserved': 'All Rights Reserved',
     'nav.mobile': 'Mobile Apps',
     'nav.navigate': 'Navigate',
@@ -80,8 +83,11 @@ export default {
 
     'juz.index.heading': 'Juz',
 
-    'login.message': 'Sign in to Quran.com to store all your bookmarks, notes, and activities.',
-    'error.invalid-surah': "Surah is out of range. Please go to <a href='/'> home page</a> and select a Surah",
-    'error.invalid-ayah': "Ayah is out of range. Please go to <a href='/'> home page </a> and select a Surah/Ayah"
+    'login.message':
+      'Sign in to Quran.com to store all your bookmarks, notes, and activities.',
+    'error.invalid-surah':
+      "Surah is out of range. Please go to <a href='/'> home page</a> and select a Surah",
+    'error.invalid-ayah':
+      "Ayah is out of range. Please go to <a href='/'> home page </a> and select a Surah/Ayah"
   }
 };
diff --git a/src/locale/fr.js b/src/locale/fr.js
index c55279083..d0784b563 100644
--- a/src/locale/fr.js
+++ b/src/locale/fr.js
@@ -25,14 +25,17 @@ export default {
     'setting.nightMode.dayTip': 'Passer en mode jour',
     'setting.nightMode.nightTip': ' Passer en mode nuit',
 
-    'ayah.media.lectureFrom': 'Regarder les commentaires de la vidéo depuis {from}',
+    'ayah.media.lectureFrom':
+      'Regarder les commentaires de la vidéo depuis {from}',
     'ayah.bookmarked': 'Favoris ajouté',
     'ayah.bookmark': 'Favoris',
     'ayah.notFound': 'Verset introuvable',
 
     'search.placeholder': 'Chercher "Noah"',
-    'search.resultHeading': '{from}-{to} DE <span> {total} </span> RESULTATS DE LA RECHERCHE POUR : <span>{query}</span>', // eslint-disable-line max-len
-    'search.error': 'Désolé, une erreur s’est produite lors de votre recherche.',
+    'search.resultHeading':
+      '{from}-{to} DE <span> {total} </span> RESULTATS DE LA RECHERCHE POUR : <span>{query}</span>', // eslint-disable-line max-len
+    'search.error':
+      'Désolé, une erreur s’est produite lors de votre recherche.',
     'search.nothing': 'Aucune requête de recherche.',
     'search.noResult': 'Aucun résultat trouvé.',
 
@@ -55,7 +58,8 @@ export default {
     'player.repeat.rangeEnd': 'A',
     'player.repeat.times': 'Fois',
     'player.repeat.loop': 'boucle',
-    'player.scrollButtonTip': 'Défiler automatiquement jusqu’au verset en cours de lecture', // eslint-disable-line max-len
+    'player.scrollButtonTip':
+      'Défiler automatiquement jusqu’au verset en cours de lecture', // eslint-disable-line max-len
 
     'app.loading': 'Chargement...',
     'actions.copy': 'Copier',
@@ -72,7 +76,8 @@ export default {
     'nav.otherLinks': 'Autre liens',
     'nav.contactUs': 'Contacter nous',
     'nav.help': 'Aide et feedback',
-    'nav.aboutQuranProject': 'Quran.com (connu aussi sous le nom The Noble Quran, Al Quran, Holy Quran, Koran) est un projet à but non-lucratif.', // eslint-disable-line max-len
+    'nav.aboutQuranProject':
+      'Quran.com (connu aussi sous le nom The Noble Quran, Al Quran, Holy Quran, Koran) est un projet à but non-lucratif.', // eslint-disable-line max-len
     'nav.rightsReserved': 'Tous droits réservés',
     'nav.mobile': 'Applications Mobile',
     'nav.navigate': 'Naviguer',
@@ -80,8 +85,11 @@ export default {
 
     'juz.index.heading': 'Juz',
 
-    'login.message': 'Identifiez-vous sur Quran.com pour enregistrer tous vos favoris, notes et activités. ',
-    'error.invalid-surah': "La sourate est hors de portée. Accédez à <a href='/'> page d'accueil </a> et sélectionnez une Sourate",
-    'error.invalid-ayah': "Ayah est hors de portée. Accédez à la <a href='/'> page d'accueil </a> et sélectionnez un Surah / Ayah"
+    'login.message':
+      'Identifiez-vous sur Quran.com pour enregistrer tous vos favoris, notes et activités. ',
+    'error.invalid-surah':
+      "La sourate est hors de portée. Accédez à <a href='/'> page d'accueil </a> et sélectionnez une Sourate",
+    'error.invalid-ayah':
+      "Ayah est hors de portée. Accédez à la <a href='/'> page d'accueil </a> et sélectionnez un Surah / Ayah"
   }
 };
diff --git a/src/locale/id.js b/src/locale/id.js
index 68521403b..d38c83a9b 100644
--- a/src/locale/id.js
+++ b/src/locale/id.js
@@ -31,7 +31,8 @@ export default {
     'ayah.notFound': 'Ayat tidak ditemukan',
 
     'search.placeholder': 'Cari "Nuh"',
-    'search.resultHeading': '{from}-{to} DARI <span> {total} </span> HASIL PENCARIAN ATAS: <span>{query}</span>', // eslint-disable-line max-len
+    'search.resultHeading':
+      '{from}-{to} DARI <span> {total} </span> HASIL PENCARIAN ATAS: <span>{query}</span>', // eslint-disable-line max-len
     'search.error': 'Maaf, terdapat kesalahan dalam pencarian Anda.',
     'search.nothing': 'Tidak ada kata yang dicari.',
     'search.noResult': 'Tidak ada hasil yang ditemukan.',
@@ -55,7 +56,8 @@ export default {
     'player.repeat.rangeEnd': 'Hingga',
     'player.repeat.times': 'Kali',
     'player.repeat.loop': 'tak berhenti',
-    'player.scrollButtonTip': 'Gulirkan secara otomatis ke ayat yang sedang diputar pada saat transisi...', // eslint-disable-line max-len
+    'player.scrollButtonTip':
+      'Gulirkan secara otomatis ke ayat yang sedang diputar pada saat transisi...', // eslint-disable-line max-len
 
     'app.loading': 'Memuat ...',
     'actions.copy': 'Salin',
@@ -72,7 +74,8 @@ export default {
     'nav.otherLinks': 'Tautan lainnya',
     'nav.contactUs': 'Hubungi kami',
     'nav.help': 'Bantuan & umpan balik',
-    'nav.aboutQuranProject': 'Quran.com (juga dikenal sebagai The Noble Quran, Al Quran, Holy Quran, Koran) adalah sebuah proyek pro bono.', // eslint-disable-line max-len
+    'nav.aboutQuranProject':
+      'Quran.com (juga dikenal sebagai The Noble Quran, Al Quran, Holy Quran, Koran) adalah sebuah proyek pro bono.', // eslint-disable-line max-len
     'nav.rightsReserved': 'Hak Cipta Terpelihara',
     'nav.mobile': 'Aplikasi Ponsel',
     'nav.navigate': 'Telusuri',
@@ -80,8 +83,11 @@ export default {
 
     'juz.index.heading': 'Juz',
 
-    'login.message': 'Masuk ke Quran.com untuk menyimpan semua penanda, catatan, dan aktivitas Anda.',
-    'error.invalid-surah': "Surah berada di luar jangkauan. Silahkan pergi ke <a href='/'> halaman rumah </a> dan pilih sebuah Surah",
-    'error.invalid-ayah': "Ayah berada di luar jangkauan. Silahkan pergi ke <a href='/'> halaman rumah </a> dan pilih Surah / Ayah"
+    'login.message':
+      'Masuk ke Quran.com untuk menyimpan semua penanda, catatan, dan aktivitas Anda.',
+    'error.invalid-surah':
+      "Surah berada di luar jangkauan. Silahkan pergi ke <a href='/'> halaman rumah </a> dan pilih sebuah Surah",
+    'error.invalid-ayah':
+      "Ayah berada di luar jangkauan. Silahkan pergi ke <a href='/'> halaman rumah </a> dan pilih Surah / Ayah"
   }
 };
diff --git a/src/locale/nl.js b/src/locale/nl.js
index ee737b3e0..b59af80c8 100644
--- a/src/locale/nl.js
+++ b/src/locale/nl.js
@@ -31,7 +31,8 @@ export default {
     'ayah.notFound': 'Ayah niet gevonden',
 
     'search.placeholder': 'Zoek "Noah"',
-    'search.resultHeading': '{from}-{to} VAN <span> {total} </span> ZOEKRESULTATEN VOOR: <span>{query}</span>', // eslint-disable-line max-len
+    'search.resultHeading':
+      '{from}-{to} VAN <span> {total} </span> ZOEKRESULTATEN VOOR: <span>{query}</span>', // eslint-disable-line max-len
     'search.error': 'Sorry, er is een fout opgetreden bij uw zoekopdracht.',
     'search.nothing': 'Geen zoekopdracht.',
     'search.noResult': 'Geen resultaten gevonden.',
@@ -72,7 +73,8 @@ export default {
     'nav.otherLinks': 'Andere links',
     'nav.contactUs': 'Contacteer ons',
     'nav.help': 'Help & feedback',
-    'nav.aboutQuranProject': 'Quran.com (ook bekend als de Edele Koran, Al Quran, Heilige Koran, Koran) is een pro bono project.', // eslint-disable-line max-len
+    'nav.aboutQuranProject':
+      'Quran.com (ook bekend als de Edele Koran, Al Quran, Heilige Koran, Koran) is een pro bono project.', // eslint-disable-line max-len
     'nav.rightsReserved': 'Alle rechten voorbehouden',
     'nav.mobile': 'Mobiele apps',
     'nav.navigate': 'Navigeer',
@@ -80,8 +82,11 @@ export default {
 
     'juz.index.heading': 'Juz',
 
-    'login.message': 'Log in op Quran.com om al je bladwijzers, notities en activiteiten op te slaan.',
-    'error.invalid-surah': "Soera is buiten bereik. Ga aub naar de <a href='/'> startpagina</a> en selecteer een Soera",
-    'error.invalid-ayah': "Ayah is buiten bereik. Ga aub naar de <a href='/'> startpagina </a> en selecteer een Soera/Ayah"
+    'login.message':
+      'Log in op Quran.com om al je bladwijzers, notities en activiteiten op te slaan.',
+    'error.invalid-surah':
+      "Soera is buiten bereik. Ga aub naar de <a href='/'> startpagina</a> en selecteer een Soera",
+    'error.invalid-ayah':
+      "Ayah is buiten bereik. Ga aub naar de <a href='/'> startpagina </a> en selecteer een Soera/Ayah"
   }
 };
diff --git a/src/locale/tr.js b/src/locale/tr.js
index 72cc2b4f8..b5363f474 100644
--- a/src/locale/tr.js
+++ b/src/locale/tr.js
@@ -31,7 +31,8 @@ export default {
     'ayah.notFound': 'Ayet bulunamadı',
 
     'search.placeholder': 'Arama yap "Nuh"',
-    'search.resultHeading': '{from}-{to} / <span> {total} </span> ARAMA SONUÇLARI: <span>{query}</span>', // eslint-disable-line max-len
+    'search.resultHeading':
+      '{from}-{to} / <span> {total} </span> ARAMA SONUÇLARI: <span>{query}</span>', // eslint-disable-line max-len
     'search.error': 'Maalesef aramanız ile ilgili bir hata oluştu.',
     'search.nothing': 'Arama sorgusu yok.',
     'search.noResult': 'Sonuç bulunamadı.',
@@ -72,7 +73,8 @@ export default {
     'nav.otherLinks': 'Diğer bağlantılar',
     'nav.contactUs': 'Bize ulaşın',
     'nav.help': 'Yardım & Geri Bildirim',
-    'nav.aboutQuranProject': "Quran.com (Kur'an-ı Kerim) bir pro bono projesidir.", // eslint-disable-line max-len
+    'nav.aboutQuranProject':
+      "Quran.com (Kur'an-ı Kerim) bir pro bono projesidir.", // eslint-disable-line max-len
     'nav.rightsReserved': 'Tüm Hakları Saklıdır',
     'nav.mobile': 'Mobil Uygulamalar',
     'nav.navigate': 'Bağlantılar', // there is no exact translation for Navigate in Turkish
@@ -80,8 +82,11 @@ export default {
 
     'juz.index.heading': 'Juza',
 
-    'login.message': "Tüm yer işaretlerinizi, notlarınızı ve etkinliklerinizi saklamak için Quran.com'a giriş yapın.",
-    'error.invalid-surah': "Surah aralık dışı. Lütfen <a href='/'> ana sayfaya </a> gidin ve bir Surah seçin",
-    'error.invalid-ayah': "Ayah menzilin dışında. Lütfen <a href='/'> ana sayfaya </a> gidin ve bir Surah / Ayah seçin"
+    'login.message':
+      "Tüm yer işaretlerinizi, notlarınızı ve etkinliklerinizi saklamak için Quran.com'a giriş yapın.",
+    'error.invalid-surah':
+      "Surah aralık dışı. Lütfen <a href='/'> ana sayfaya </a> gidin ve bir Surah seçin",
+    'error.invalid-ayah':
+      "Ayah menzilin dışında. Lütfen <a href='/'> ana sayfaya </a> gidin ve bir Surah / Ayah seçin"
   }
 };
diff --git a/src/locale/ur.js b/src/locale/ur.js
index 5d6055b87..3ebfc2230 100644
--- a/src/locale/ur.js
+++ b/src/locale/ur.js
@@ -3,7 +3,8 @@ export default {
   messages: {
     local: 'urdu',
     'local.siteLocale': 'سائٹ کی زبان',
-    'local.changeLocal': 'جس زبان میں سایٹ دیکہنا چاہتے ہیں اس زبان کا انتخاب کریں',
+    'local.changeLocal':
+      'جس زبان میں سایٹ دیکہنا چاہتے ہیں اس زبان کا انتخاب کریں',
     'local.nativeName': 'اردو',
     'local.selectLabel': 'زبان',
     'setting.title': 'اختیارات',
@@ -31,7 +32,8 @@ export default {
     'ayah.notFound': 'آیت نہیں ملا',
 
     'search.placeholder': 'تلاش کر یں',
-    'search.resultHeading': '{from}-{to} OF <span> {total} </span> SEARCH RESULTS FOR: <span>{query}</span>', // eslint-disable-line max-len
+    'search.resultHeading':
+      '{from}-{to} OF <span> {total} </span> SEARCH RESULTS FOR: <span>{query}</span>', // eslint-disable-line max-len
     'search.error': 'معذرت، آپ کی تلاش کے ساتھ ایک خرابی پیش آگئی ہے',
     'search.nothing': 'تلاش کے لئے کچھ لکھئے',
     'search.noResult': 'کوئی نتیجہ نہیں ملا',
@@ -72,7 +74,8 @@ export default {
     'nav.otherLinks': 'دیگر لنکس',
     'nav.contactUs': 'ہم سے رابطہ',
     'nav.help': 'مدد اور تاثرات',
-    'nav.aboutQuranProject': 'قرآن کریم ایک فلاح عامہ (عوامی بہبود کے لئے) منصوبہ ہے',
+    'nav.aboutQuranProject':
+      'قرآن کریم ایک فلاح عامہ (عوامی بہبود کے لئے) منصوبہ ہے',
     'nav.rightsReserved': 'جملہ حقوق محفوظ ہیں',
     'nav.mobile': 'موبائل',
     'nav.navigate': 'تشریف لے جائیں',
@@ -80,8 +83,11 @@ export default {
 
     'juz.index.heading': 'سپارے',
 
-    'login.message': 'Quran.com کرنے کیلئے سائن ان سب کو اپنے بک مارکس، نوٹوں اور سرگرمیوں کو ذخیرہ کرنے.',
-    'error.invalid-surah': "سورہ رینج سے باہر ہے. براہ مہربانی <a href='/'> صفحۂ اول</a> پر جائیں اور درست سوره منتخب کریں",
-    'error.invalid-ayah': "آیت رینج سے باہر ہے. براہ مہربانی <a href='/'> صفحۂ اول</a> پر جائیں اور درست سوره/آیت منتخب کریں"
+    'login.message':
+      'Quran.com کرنے کیلئے سائن ان سب کو اپنے بک مارکس، نوٹوں اور سرگرمیوں کو ذخیرہ کرنے.',
+    'error.invalid-surah':
+      "سورہ رینج سے باہر ہے. براہ مہربانی <a href='/'> صفحۂ اول</a> پر جائیں اور درست سوره منتخب کریں",
+    'error.invalid-ayah':
+      "آیت رینج سے باہر ہے. براہ مہربانی <a href='/'> صفحۂ اول</a> پر جائیں اور درست سوره/آیت منتخب کریں"
   }
 };
diff --git a/src/redux/actions/verses.js b/src/redux/actions/verses.js
index 4b149b65b..37a637080 100644
--- a/src/redux/actions/verses.js
+++ b/src/redux/actions/verses.js
@@ -15,7 +15,7 @@ import {
 
 // NOTE: For safe measure
 const defaultOptions = {
-  translations: [101]
+  translations: [108]
 };
 
 // NOTE: From the API!
@@ -30,7 +30,7 @@ function prepareParams(params, options) {
       ? params.translations.split(',')
       : params.translations;
   } else {
-    translations = options.translations || defaultOptions.translations;
+    translations = options.translations; // || defaultOptions.translations;
   }
 
   return { translations };
diff --git a/src/redux/modules/options.js b/src/redux/modules/options.js
index a73c0e624..adbb169c5 100644
--- a/src/redux/modules/options.js
+++ b/src/redux/modules/options.js
@@ -16,7 +16,7 @@ const initialState = {
   isNightMode: options.isNightMode || false,
   isShowingSurahInfo: options.isShowingSurahInfo || false,
   audio: options.audio || 7, // Mishari Rashid al-`Afasy
-  translations: options.translations || [101], // Clear Quran
+  translations: options.translations || [108], // Clear Quran
   tooltip: options.tooltip || 'translation',
   fontSize: options.fontSize || {
     arabic: 3.5,
diff --git a/src/styles/partials/_surah_names.scss b/src/styles/partials/_surah_names.scss
index e470dd85d..30cdef6c6 100755
--- a/src/styles/partials/_surah_names.scss
+++ b/src/styles/partials/_surah_names.scss
@@ -1,5 +1,5 @@
-[class^="icon-surah"],
-[class*=" icon-surah"] {
+[class^='icon-surah'],
+[class*=' icon-surah'] {
   font-family: 'surah_names' !important;
   speak: none;
   font-style: normal;
@@ -16,347 +16,347 @@
 }
 
 .icon-surah59:before {
-  content: "\e900";
+  content: '\e900';
 }
 .icon-surah60:before {
-  content: "\e901";
+  content: '\e901';
 }
 .icon-surah48:before {
-  content: "\e902";
+  content: '\e902';
 }
 .icon-surah:before {
-  content: "\e903";
+  content: '\e903';
 }
 .icon-surah1:before {
-  content: "\e904";
+  content: '\e904';
 }
 .icon-surah2:before {
-  content: "\e905";
+  content: '\e905';
 }
 .icon-surah3:before {
-  content: "\e906";
+  content: '\e906';
 }
 .icon-surah4:before {
-  content: "\e907";
+  content: '\e907';
 }
 .icon-surah5:before {
-  content: "\e908";
+  content: '\e908';
 }
 .icon-surah38:before {
-  content: "\e909";
+  content: '\e909';
 }
 .icon-surah39:before {
-  content: "\e90a";
+  content: '\e90a';
 }
 .icon-surah6:before {
-  content: "\e90b";
+  content: '\e90b';
 }
 .icon-surah7:before {
-  content: "\e90c";
+  content: '\e90c';
 }
 .icon-surah8:before {
-  content: "\e90d";
+  content: '\e90d';
 }
 .icon-surah9:before {
-  content: "\e90e";
+  content: '\e90e';
 }
 .icon-surah10:before {
-  content: "\e90f";
+  content: '\e90f';
 }
 .icon-surah11:before {
-  content: "\e910";
+  content: '\e910';
 }
 .icon-surah12:before {
-  content: "\e911";
+  content: '\e911';
 }
 .icon-surah13:before {
-  content: "\e912";
+  content: '\e912';
 }
 .icon-surah14:before {
-  content: "\e913";
+  content: '\e913';
 }
 .icon-surah15:before {
-  content: "\e914";
+  content: '\e914';
 }
 .icon-surah16:before {
-  content: "\e915";
+  content: '\e915';
 }
 .icon-surah17:before {
-  content: "\e916";
+  content: '\e916';
 }
 .icon-surah18:before {
-  content: "\e917";
+  content: '\e917';
 }
 .icon-surah19:before {
-  content: "\e918";
+  content: '\e918';
 }
 .icon-surah20:before {
-  content: "\e919";
+  content: '\e919';
 }
 .icon-surah21:before {
-  content: "\e91a";
+  content: '\e91a';
 }
 .icon-surah22:before {
-  content: "\e91b";
+  content: '\e91b';
 }
 .icon-surah23:before {
-  content: "\e91c";
+  content: '\e91c';
 }
 .icon-surah24:before {
-  content: "\e91d";
+  content: '\e91d';
 }
 .icon-surah25:before {
-  content: "\e91e";
+  content: '\e91e';
 }
 .icon-surah26:before {
-  content: "\e91f";
+  content: '\e91f';
 }
 .icon-surah27:before {
-  content: "\e920";
+  content: '\e920';
 }
 .icon-surah28:before {
-  content: "\e921";
+  content: '\e921';
 }
 .icon-surah29:before {
-  content: "\e922";
+  content: '\e922';
 }
 .icon-surah30:before {
-  content: "\e923";
+  content: '\e923';
 }
 .icon-surah31:before {
-  content: "\e924";
+  content: '\e924';
 }
 .icon-surah32:before {
-  content: "\e925";
+  content: '\e925';
 }
 .icon-surah33:before {
-  content: "\e926";
+  content: '\e926';
 }
 .icon-surah40:before {
-  content: "\e927";
+  content: '\e927';
 }
 .icon-surah41:before {
-  content: "\e928";
+  content: '\e928';
 }
 .icon-surah42:before {
-  content: "\e929";
+  content: '\e929';
 }
 .icon-surah43:before {
-  content: "\e92a";
+  content: '\e92a';
 }
 .icon-surah44:before {
-  content: "\e92b";
+  content: '\e92b';
 }
 .icon-surah45:before {
-  content: "\e92c";
+  content: '\e92c';
 }
 .icon-surah46:before {
-  content: "\e92d";
+  content: '\e92d';
 }
 .icon-surah34:before {
-  content: "\e92e";
+  content: '\e92e';
 }
 .icon-surah35:before {
-  content: "\e92f";
+  content: '\e92f';
 }
 .icon-surah36:before {
-  content: "\e930";
+  content: '\e930';
 }
 .icon-surah37:before {
-  content: "\e931";
+  content: '\e931';
 }
 .icon-surah47:before {
-  content: "\e932";
+  content: '\e932';
 }
 .icon-surah49:before {
-  content: "\e933";
+  content: '\e933';
 }
 .icon-surah50:before {
-  content: "\e934";
+  content: '\e934';
 }
 .icon-surah51:before {
-  content: "\e935";
+  content: '\e935';
 }
 .icon-surah52:before {
-  content: "\e936";
+  content: '\e936';
 }
 .icon-surah53:before {
-  content: "\e937";
+  content: '\e937';
 }
 .icon-surah54:before {
-  content: "\e938";
+  content: '\e938';
 }
 .icon-surah55:before {
-  content: "\e939";
+  content: '\e939';
 }
 .icon-surah56:before {
-  content: "\e93a";
+  content: '\e93a';
 }
 .icon-surah57:before {
-  content: "\e93b";
+  content: '\e93b';
 }
 .icon-surah58:before {
-  content: "\e93c";
+  content: '\e93c';
 }
 .icon-surah79:before {
-  content: "\e93d";
+  content: '\e93d';
 }
 .icon-surah80:before {
-  content: "\e93e";
+  content: '\e93e';
 }
 .icon-surah81:before {
-  content: "\e93f";
+  content: '\e93f';
 }
 .icon-surah82:before {
-  content: "\e940";
+  content: '\e940';
 }
 .icon-surah61:before {
-  content: "\e941";
+  content: '\e941';
 }
 .icon-surah62:before {
-  content: "\e942";
+  content: '\e942';
 }
 .icon-surah63:before {
-  content: "\e943";
+  content: '\e943';
 }
 .icon-surah64:before {
-  content: "\e944";
+  content: '\e944';
 }
 .icon-surah65:before {
-  content: "\e945";
+  content: '\e945';
 }
 .icon-surah66:before {
-  content: "\e946";
+  content: '\e946';
 }
 .icon-surah67:before {
-  content: "\e947";
+  content: '\e947';
 }
 .icon-surah68:before {
-  content: "\e948";
+  content: '\e948';
 }
 .icon-surah69:before {
-  content: "\e949";
+  content: '\e949';
 }
 .icon-surah70:before {
-  content: "\e94a";
+  content: '\e94a';
 }
 .icon-surah71:before {
-  content: "\e94b";
+  content: '\e94b';
 }
 .icon-surah72:before {
-  content: "\e94c";
+  content: '\e94c';
 }
 .icon-surah73:before {
-  content: "\e94d";
+  content: '\e94d';
 }
 .icon-surah74:before {
-  content: "\e94e";
+  content: '\e94e';
 }
 .icon-surah75:before {
-  content: "\e94f";
+  content: '\e94f';
 }
 .icon-surah76:before {
-  content: "\e950";
+  content: '\e950';
 }
 .icon-surah77:before {
-  content: "\e951";
+  content: '\e951';
 }
 .icon-surah78:before {
-  content: "\e952";
+  content: '\e952';
 }
 .icon-surah83:before {
-  content: "\e953";
+  content: '\e953';
 }
 .icon-surah84:before {
-  content: "\e954";
+  content: '\e954';
 }
 .icon-surah85:before {
-  content: "\e955";
+  content: '\e955';
 }
 .icon-surah86:before {
-  content: "\e956";
+  content: '\e956';
 }
 .icon-surah87:before {
-  content: "\e957";
+  content: '\e957';
 }
 .icon-surah88:before {
-  content: "\e958";
+  content: '\e958';
 }
 .icon-surah89:before {
-  content: "\e959";
+  content: '\e959';
 }
 .icon-surah90:before {
-  content: "\e95a";
+  content: '\e95a';
 }
 .icon-surah91:before {
-  content: "\e95b";
+  content: '\e95b';
 }
 .icon-surah92:before {
-  content: "\e95c";
+  content: '\e95c';
 }
 .icon-surah93:before {
-  content: "\e95d";
+  content: '\e95d';
 }
 .icon-surah94:before {
-  content: "\e95e";
+  content: '\e95e';
 }
 .icon-surah95:before {
-  content: "\e95f";
+  content: '\e95f';
 }
 .icon-surah96:before {
-  content: "\e960";
+  content: '\e960';
 }
 .icon-surah97:before {
-  content: "\e961";
+  content: '\e961';
 }
 .icon-surah98:before {
-  content: "\e962";
+  content: '\e962';
 }
 .icon-surah99:before {
-  content: "\e963";
+  content: '\e963';
 }
 .icon-surah100:before {
-  content: "\e964";
+  content: '\e964';
 }
 .icon-surah101:before {
-  content: "\e965";
+  content: '\e965';
 }
 .icon-surah102:before {
-  content: "\e966";
+  content: '\e966';
 }
 .icon-surah103:before {
-  content: "\e967";
+  content: '\e967';
 }
 .icon-surah104:before {
-  content: "\e968";
+  content: '\e968';
 }
 .icon-surah105:before {
-  content: "\e969";
+  content: '\e969';
 }
 .icon-surah106:before {
-  content: "\e96a";
+  content: '\e96a';
 }
 .icon-surah107:before {
-  content: "\e96b";
+  content: '\e96b';
 }
 .icon-surah108:before {
-  content: "\e96c";
+  content: '\e96c';
 }
 .icon-surah109:before {
-  content: "\e96d";
+  content: '\e96d';
 }
 .icon-surah110:before {
-  content: "\e96e";
+  content: '\e96e';
 }
 .icon-surah111:before {
-  content: "\e96f";
+  content: '\e96f';
 }
 .icon-surah112:before {
-  content: "\e970";
+  content: '\e970';
 }
 .icon-surah113:before {
-  content: "\e971";
+  content: '\e971';
 }
 .icon-surah114:before {
-  content: "\e972";
+  content: '\e972';
 }
diff --git a/src/utils/routeFilters.js b/src/utils/routeFilters.js
index 213b5a620..a45362095 100644
--- a/src/utils/routeFilters.js
+++ b/src/utils/routeFilters.js
@@ -20,8 +20,11 @@ function filterValidVerse(replaceState, chapterId, verseRange) {
   if (verseRange) {
     if (verseRange.includes('-')) {
       const [from, to] = verseRange.split('-').map(num => parseInt(num, 10));
-      if (isNaN(from) || isNaN(to) ||
-          from < 1 || to > chapterToVersesMap[chapterId]
+      if (
+        isNaN(from) ||
+        isNaN(to) ||
+        from < 1 ||
+        to > chapterToVersesMap[chapterId]
       ) {
         replaceState('/error/invalid-ayah');
       }
@@ -60,7 +63,8 @@ export default function checkValidChapterOrVerse(nextState, replaceState) {
       const verseId = parseInt(nextState.params.range, 10);
 
       if (replaceChapterOrRange(nextState.params)) {
-        let location = `${nextState.location.pathname}${nextState.location.search}`;
+        let location = `${nextState.location.pathname}${nextState.location
+          .search}`;
         location = location.replace(
           /\/([0-9]+)\/([0-9]+)/,
           `/${chapterId}/${verseId}`