diff --git a/src/html/index.html b/src/html/index.html
index 274c97f..4c3b24f 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title></title>
+    <title>The Noble Quran</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <script src="/js/index.js"></script>
   </head>
   <body>
     <div class="app mount root h-full"></div>
+    <script src="/js/index.js"></script>
   </body>
 </html>
diff --git a/src/js/components/Select/LanguageSelect.tsx b/src/js/components/Select/LanguageSelect.tsx
index 54ac140..c7297ec 100644
--- a/src/js/components/Select/LanguageSelect.tsx
+++ b/src/js/components/Select/LanguageSelect.tsx
@@ -15,6 +15,11 @@ export function LanguageSelect({
   setActiveLocale,
 }: Props) {
   const locales = Object.values(Quran.locales);
+
+  if (!activeLocale) {
+    return null;
+  }
+
   return (
     <Select
       value={activeLocale.name}
diff --git a/src/js/components/SurahIndex/index.tsx b/src/js/components/SurahIndex/index.tsx
index a647f94..d1a572f 100644
--- a/src/js/components/SurahIndex/index.tsx
+++ b/src/js/components/SurahIndex/index.tsx
@@ -52,7 +52,7 @@ export function SurahIndex({ locale, surahs, t }: Props) {
         <LanguageSelect
           isOpen={showLangDropdown}
           setIsOpen={setShowLangDropdown}
-          locale={activeLocale}
+          activeLocale={activeLocale}
           setActiveLocale={setActiveLocale}
         />
         <ThemeSelect
diff --git a/src/js/index.tsx b/src/js/index.tsx
index 03aaf72..fd7216f 100644
--- a/src/js/index.tsx
+++ b/src/js/index.tsx
@@ -9,7 +9,7 @@ import classNames from "classnames";
 import { Router } from "preact-router";
 import "core-js";
 
-const exports = {
+const globals = {
   Quran,
   React,
   render,
@@ -19,43 +19,40 @@ const exports = {
   useRef,
   classNames,
 };
-Object.assign(window, exports);
+Object.assign(window, globals);
 
-document.addEventListener("DOMContentLoaded", () => {
-  const Main = (function () {
-    const t = T(require("@json/t.json"));
-    return () => {
-      return (
-        <Router>
-          <SurahIndex
-            path="/"
-            locale={Quran.locales["en"]}
-            surahs={Quran.surahs}
-            t={t}
-          />
-          <SurahIndex
-            path="/en"
-            locale={Quran.locales["en"]}
-            surahs={Quran.surahs}
-            t={t}
-          />
-          <SurahIndex
-            path="/ar"
-            locale={Quran.locales["ar"]}
-            surahs={Quran.surahs}
-            t={t}
-          />
-          <SurahIndex
-            path="/fa"
-            locale={Quran.locales["fa"]}
-            surahs={Quran.surahs}
-            t={t}
-          />
-          <SurahStream path="/:localeId/:surahId" t={t} />
-        </Router>
-      );
-    };
-  })();
-
-  render(<Main />, document.querySelector(".mount"));
-});
+const Main = (function () {
+  const t = T(require("@json/t.json"));
+  return () => {
+    return (
+      <Router>
+        <SurahIndex
+          path="/"
+          locale={Quran.locales["en"]}
+          surahs={Quran.surahs}
+          t={t}
+        />
+        <SurahIndex
+          path="/en"
+          locale={Quran.locales["en"]}
+          surahs={Quran.surahs}
+          t={t}
+        />
+        <SurahIndex
+          path="/ar"
+          locale={Quran.locales["ar"]}
+          surahs={Quran.surahs}
+          t={t}
+        />
+        <SurahIndex
+          path="/fa"
+          locale={Quran.locales["fa"]}
+          surahs={Quran.surahs}
+          t={t}
+        />
+        <SurahStream path="/:localeId/:surahId" t={t} />
+      </Router>
+    );
+  };
+})();
+render(<Main />, document.querySelector(".mount"));
