diff --git a/LICENSE b/LICENSE
index 3533007..f6124dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Guus van Meerveld
+Copyright (c) 2020 Guus van Meerveld & Martijn Oosterhuis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 03f5d6a..e071a88 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+<p align="center"><img src="icons/banner.png" width="400"></p>
+
 # Magister Auto-Login
 
 Automagically logs into Magister 6 so you won't have to.
diff --git a/icons/banner.png b/icons/banner.png
new file mode 100644
index 0000000..b5e4a4c
Binary files /dev/null and b/icons/banner.png differ
diff --git a/js/login.js b/js/login.js
index 64485f5..b5735fa 100644
--- a/js/login.js
+++ b/js/login.js
@@ -7,17 +7,19 @@ var snooze = ms => new Promise(res => setTimeout(res, ms));
 function login() {
     chrome.storage.sync.get(['school','number', 'password'], async function (result) {
 
-        await waitForSel("#scholenkiezer_value");
-
-        if (d("scholenkiezer_value") && result.number) {
-            d("scholenkiezer_value").value = result.school;
-            d("scholenkiezer_value").dispatchEvent(new Event("input"));
-        };
-
-        await waitForSel(".selected");
-
-        if (q(".selected")) {
-            q(".selected").click();
+        if (d("scholenkiezer_value")) {
+            await waitForSel("#scholenkiezer_value");
+    
+            if (d("scholenkiezer_value") && result.number) {
+                d("scholenkiezer_value").value = result.school;
+                d("scholenkiezer_value").dispatchEvent(new Event("input"));
+            };
+    
+            await waitForSel(".selected");
+    
+            if (q(".selected")) {
+                q(".selected").click();
+            }
         }
         
         await waitForSel("#username");
diff --git a/js/save.js b/js/save.js
index d154666..0da9dff 100644
--- a/js/save.js
+++ b/js/save.js
@@ -32,9 +32,9 @@ function save() {
         "password": password
         });
 
-        d("save").innerHTML = "Saved!"
+        d("save").innerHTML = "Opgeslagen!"
     } catch (e) {
-        d("save").innerHTML = "Error"
+        d("save").innerHTML = "Fout"
         d("save").className = "btn btn-danger float-right"
     }
 };
@@ -62,7 +62,7 @@ function onLoad() {
 
     chrome.storage.sync.get(['darkmode'], function (result) {
         d("dark-mode").checked = result.darkmode
-        d("dark-link").disabled = d("dark-mode").checked ? false : true
+        d("dark-link").disabled = !d("dark-mode").checked
     });
 
     d("switch").addEventListener("click", toggle)
@@ -84,10 +84,8 @@ function darkMode() {
     chrome.storage.sync.set({
         "darkmode": d("dark-mode").checked
     });
-
-    console.log(!d("dark-mode").checked);
     
-    d("dark-link").disabled = d("dark-mode").checked ? false : true
+    d("dark-link").disabled = !d("dark-mode").checked
 
 }
 
diff --git a/manifest.json b/manifest.json
index 5ec97c8..aaf50ee 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Magister Auto-Login",
-  "version": "1.1",
+  "version": "2.0",
   "manifest_version": 2,
   "description": "Auto-Login for Magister 6 webapp.",
   "options_page": "options/index.html",
diff --git a/options/index.html b/options/index.html
index 51edca9..ba8edcb 100644
--- a/options/index.html
+++ b/options/index.html
@@ -26,21 +26,21 @@
             <div class="row">
                 <div class="col">
                     <label for="">School:</label>
-                    <input type="text" class="form-control mb-3 login" autofocus name="school" id="school" placeholder="Enter school">
+                    <input type="text" class="form-control mb-3 login" autofocus name="school" id="school" placeholder="Vul je school in">
                     <hr class="bg-light mb-3">
-                    <label for="">Username:</label>
+                    <label for="">Stamnummer</label>:</label>
                     <input type="text" class="form-control mb-3 login" autofocus name="number" id="number"
-                        placeholder="Enter username">
+                        placeholder="Vul je stamnummer in">
                     <hr class="bg-light mb-3">
-                    <label for="">Password:</label>
+                    <label for="">Wachtwoord:</label>
                     <input type="password" class="form-control mb-3 login" name="password" id="password"
-                        placeholder="Enter password">
+                        placeholder="Vul je wachtwoord in">
                     <hr class="bg-light mb-3">
-                    <button class="btn-primary btn float-right" id="save">Save</button>
+                    <button class="btn-primary btn float-right" id="save">Opslaan</button>
                 </div>
             </div>
         </div>
-        <p class="copyright" title="Kleine credit naar Sam Taen">By Martijn Oosterhuis & Guus van Meerveld</p>
+        <p class="copyright" title="Kleine credit naar Sam Taen">Door Martijn Oosterhuis & Guus van Meerveld</p>
     </div>
 
 
diff --git a/popup/index.html b/popup/index.html
index 4d5ad1d..6caddbf 100644
--- a/popup/index.html
+++ b/popup/index.html
@@ -17,17 +17,18 @@
             <div class="row">
                 <div class="col">
                     <label for="">School:</label>
-                    <input type="text" class="form-control mb-3 login" autofocus name="school" id="school" placeholder="Enter school">
+                    <input type="text" class="form-control mb-3 login" autofocus name="school" id="school"
+                        placeholder="Vul je school in">
                     <hr class="bg-light mb-3">
-                    <label for="">Username:</label>
+                    <label for="">Stamnummer</label>:</label>
                     <input type="text" class="form-control mb-3 login" autofocus name="number" id="number"
-                        placeholder="Enter username">
+                        placeholder="Vul je stamnummer in">
                     <hr class="bg-light mb-3">
-                    <label for="">Password:</label>
+                    <label for="">Wachtwoord:</label>
                     <input type="password" class="form-control mb-3 login" name="password" id="password"
-                        placeholder="Enter password">
+                        placeholder="Vul je wachtwoord in">
                     <hr class="bg-light mb-3">
-                    <button class="btn-primary btn float-right" id="save">Save</button>
+                    <button class="btn-primary btn float-right" id="save">Opslaan</button>
                     <div class="material-switch pull-right enable">
                         <input id="switch" type="checkbox">
                         <label for="switch" class="label-primary"></label>