diff --git a/package.json b/package.json
index b12259c..6517e9e 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
   "license": "MIT",
   "dependencies": {
     "express": "^4.14.0",
-    "morgan": "^1.7.0",
     "socketio": "^1.0.0",
     "toml": "^2.3.0"
   },
diff --git a/public/index.html b/public/index.html
index 4c2f5f1..3c64b15 100644
--- a/public/index.html
+++ b/public/index.html
@@ -61,17 +61,20 @@
 						<div class="settings" style="display: none;">
 							<h1 class="grade1">Teemant Settings</h1>
 							<h1 class="grade2">Chat</h1>
-							<p>Shared input field <input type="checkbox" name="colors" id="s_sharedInput"></p>
+							<p><label for="s_scrollOnResize">Scroll to bottom on window resize</label> <input type="checkbox" id="s_scrollOnResize" checked="checked"></p>
+							<h1 class="grade3">Input</h1>
+							<p><label for="s_sharedInput">Shared input field</label> <input type="checkbox" id="s_sharedInput"></p>
+							<p><label for="s_scrollOnFocus"> Scroll to bottom on input focus</label> <input type="checkbox" id="s_scrollOnFocus" checked="checked"></p>
 							<h1 class="grade3">Colors</h1>
-							<p>Enable colored messages <input type="checkbox" name="colors" id="s_colors" checked="checked"></p>
-							<p>Color nicknames <input type="checkbox" name="colored_nicks" id="s_colorNicknames" checked="checked"></p>
-							<p>Color nicknames in the user list<input type="checkbox" name="colored_nicks_list" id="s_colorNicklist"></p>
+							<p><label for="s_colors">Enable colored messages</label> <input type="checkbox" id="s_colors" checked="checked"></p>
+							<p><label for="s_colorNicknames">Color nicknames</label> <input type="checkbox" id="s_colorNicknames" checked="checked"></p>
+							<p><label for="s_colorNicklist">Color nicknames in the user list</label> <input type="checkbox" id="s_colorNicklist"></p>
 							<h1 class="grade3">Timestamps</h1>
-							<p>Enable timestamps on messages <input type="checkbox" name="timestamps" id="s_timestamps" checked="checked"></p>
-							<label for="timestamp_format">Timestamp format</label>
-							<input type="text" name="timestamp_format" id="s_timestampFormat" value="HH:mm:ss"><br>
+							<p><label for="s_timestamps">Enable timestamps on messages</label> <input type="checkbox" id="s_timestamps" checked="checked"></p>
+							<label for="s_timestampFormat">Timestamp format</label>
+							<input type="text" id="s_timestampFormat" value="HH:mm:ss"><br>
 							<i style="font-size: 80%;">`<code>hh:mm:ss TT</code>` would be 12-hour format with PM/AM</i>
-							<h1 class="grade3">Themes</h1>
+							<h1 class="grade2">Themes</h1>
 							<div class="available_themes"></div>
 							<br>
 							<p><button class="regular_btn" id="save_settings">Save Settings</button></p>
diff --git a/public/js/main.js b/public/js/main.js
index 18070cf..6b9eedc 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -8,12 +8,14 @@ window.irc = {
 		timestampFormat: "HH:mm:ss",
 		colorNicknames: true,
 		colorNicklist: false,
+		scrollOnResize: true,
+		scrollOnFocus: true,
 		theme: "default"
 	},
 	serverData: {},
 	serverChatQueue: {},
 	chatType: "simple",
-	documentTitle: "TeemantIRC"
+	documentTitle: "TeemantIRC",
 };
 
 window.clientdom = {connector: {}, settings: {}};
@@ -1317,6 +1319,11 @@ class InputHandler {
 			this.keyDownHandle(e, key);
 		}
 
+		clientdom.input.onfocus = (e) => {
+			if(irc.config.scrollOnFocus)
+				clientdom.letterbox.scrollTop = clientdom.letterbox.scrollHeight;
+		}
+
 		clientdom.send.onclick = (e) => {
 			this.handleInput();
 		}
@@ -1845,6 +1852,11 @@ function parseURL() {
 
 window.onpopstate = parseURL;
 
+window.onresize = function() {
+	if(irc.config.scrollOnResize)
+		clientdom.letterbox.scrollTop = clientdom.letterbox.scrollHeight;
+}
+
 window.onload = function() {
 	irc.primaryFrame = document.querySelector('.ircclient');