diff --git a/resources/index.html b/resources/index.html
index c4ecadc..9766e00 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -18,9 +18,11 @@
       </div>
     </div>
     <div id="settingsPanel" style="display: none;">
-      <span id="fullSettingsTitle">Settings</span>
-      <div id="settingsClose">
-        <img src="icons/close.svg" onclick="closeSettings()" />
+      <div id="settingsTitleBar">
+        <span id="fullSettingsTitle">Settings</span>
+        <div id="settingsClose">
+          <img src="icons/close.svg" onclick="closeSettings()" />
+        </div>
       </div>
       <div id="settingsPanelInner">
         <div class="settingTitle", id="scriptsTitle">
diff --git a/resources/js/index.js b/resources/js/index.js
index a3f9844..290a957 100644
--- a/resources/js/index.js
+++ b/resources/js/index.js
@@ -497,7 +497,7 @@ async function toggleServerLaunchSection() {
 
 async function getLanguages() {
   const languageFiles = (await filesystem.readDirectory(`${NL_CWD}/languages`)).filter(file => file.entry.endsWith('.json'))
-
+  const config = await getCfg()
 
   // Load all languages as options
   for (const file of languageFiles) {
@@ -507,9 +507,15 @@ async function getLanguages() {
     const option = document.createElement('option')
     option.value = lang
     option.innerHTML = fullLanguageName
+    
+    // Set language selected to config language
+    if (lang === config.language) {
+      option.selected = true
+    }
 
     document.querySelector('#languageSelect').appendChild(option)
   }
+
 }
 
 async function handleLanguageChange(elm) {
diff --git a/resources/style/index.css b/resources/style/index.css
index 1da6c9c..e7d2b6c 100644
--- a/resources/style/index.css
+++ b/resources/style/index.css
@@ -102,9 +102,15 @@ body {
   height: 30px;
 }
 
+#settingsTitleBar {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+
 #settingsClose {
   display: inline-block;
-  margin-left: 70%;
   transition: filter 0.1s ease-in-out;
 }