diff --git a/lib/settings-screen.css b/lib/settings-screen.css
index 435e353..f33119c 100644
--- a/lib/settings-screen.css
+++ b/lib/settings-screen.css
@@ -33,8 +33,10 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .settings .infoPane a:hover {text-decoration: underline}
 .settings .logo {position: relative; margin-top: 2px; width: 100px}
 .settings .version {position: relative; display: block; margin-top: 5px; margin-bottom: 10px; font-size: 10px; color: #bbb}
-.settings .settingsColumn1 {width: 220px; height: 560px; padding: 20px; float: left}
-.settings .settingsColumn2 {width: 420px; height: 560px; padding: 20px 20px 20px 0; float: left}
+.settings .tabContainer {background: #fff; height: 38px; padding-top: 20px}
+.settings .tabContainer .tab {padding: 12px; background: #444; margin-right: 1px; float: left; cursor: pointer}
+.settings .tabContainer .tabActive {background: #1c1c19}
+.settings .section {width: 640px; height: 450px; padding: 20px; margin-top: 10px; float: left}
 .settings input, .settings textarea {border: 1px solid #555; background-color: #444; color: #fff}
 .settings input:focus, .settings textarea:focus {
 	outline: none;
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
index 29645f2..2b1b029 100644
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -84,112 +84,90 @@ for ($i=0;$i<count($themeArray);$i++) {
 </div>
 
 <form name="settings" action="settings.php" method="POST">
-<div class="settingsColumn1">
-<h2><?php echo $t['functionality'];?></h2>
-<input type="checkbox" onclick="showButton()" name="checkUpdates" value="true"<?php if($ICEcoder["checkUpdates"]) {echo ' checked';};?>> <?php echo $t['check for updates...'];?><br>
-<input type="checkbox" onclick="showButton()" name="openLastFiles" value="true"<?php if($ICEcoder["openLastFiles"]) {echo ' checked';};?>> <?php echo $t['auto open last...'];?><br>
-<input type="checkbox" onclick="showButton()" name="updateDiffOnSave" value="true"<?php if($ICEcoder["updateDiffOnSave"]) {echo ' checked';};?>> update diff pane on save<br>
-language <span class="info" title="Reload required after changing">[?]</span><br>
-<select onchange="showButton()" name="languageUser">
-<?php
-$langFiles = array("chinese-simplified.php","chinese-traditional.php","dutch.php","english.php","french.php","german.php","italian.php","norwegian.php","persian.php","portuguese-brazilian.php","spanish.php");
-$langText = array("中国（简体）","中國（繁體）","Nederlands","English","Français","Deutsch","Italiano","Norsk","فارسی","Portugues(br)","Espa&ntilde;ol");
-for ($i=0; $i<count($langFiles); $i++) {
-	echo '<option value="'.$langFiles[$i].'"'.($ICEcoder["languageUser"]==$langFiles[$i] ? ' selected' : '').'>'.$langText[$i].'</option>'.PHP_EOL;
-}
-?>
-</select><br>
-<br>
-<?php echo $t['when finding in...'];?>:<br>
-<input type="text" onkeydown="showButton()" name="findFilesExclude" value="<?php echo implode(", ",$ICEcoder["findFilesExclude"]); ?>"><br>
-<br>
 
-<h2><?php echo $t['assisting'];?></h2>
-<input type="checkbox" onclick="showButton()" name="codeAssist" value="true"<?php if($ICEcoder["codeAssist"]) {echo ' checked';};?>> <?php echo $t['code assist'];?><br>
-<input type="checkbox" onclick="showButton();showHideTabs()" name="visibleTabs" value="true"<?php if($ICEcoder["visibleTabs"]) {echo ' checked';};?>> <?php echo $t['visible tabs'];?><br>
-<input type="checkbox" onclick="showButton()" name="lockedNav" value="true"<?php if($ICEcoder["lockedNav"]) {echo ' checked';};?>> <?php echo $t['locked nav'];?><br><br>
-<?php echo $t['tag wrapper command'];?><br>
-<select onchange="showButton()" name="tagWrapperCommand">
-	<option value="ctrl+alt"<?php if($ICEcoder["tagWrapperCommand"]=='ctrl+alt') {echo " selected";};?>>ctrl/cmd + alt</option>
-	<option value="alt-left"<?php if($ICEcoder["tagWrapperCommand"]=='alt-left') {echo " selected";};?>>alt left</option>
-</select><br>
-<br>
-<?php echo $t['auto-complete on'];?><br>
-<select onchange="showButton()" name="autoComplete">
-	<option value="ctrl+space"<?php if($ICEcoder["autoComplete"]=='ctrl+space') {echo " selected";};?>>ctrl/cmd + space</option>
-	<option value="keypress"<?php if($ICEcoder["autoComplete"]=='keypress') {echo " selected";};?>>keypress</option>
-</select><br>
-<br>
-
-<h2><?php echo $t['security'];?></h2>
-<?php echo $t['new password'];?> <span class="info" title="<?php echo $t['8 chars min'];?>">[?]</span><br>
-<input type="password" name="password" onkeydown="showButton()"><br>
-<?php echo $t['confirm password'];?><br>
-<input type="password" name="passwordConfirm" onkeydown="showButton()"><br>
-<br>
-<?php echo $t['banned files/folders'];?><br>
-<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedFiles" value="<?php echo implode(", ",$ICEcoder["bannedFiles"]); ?>"><br>
-<?php echo $t['banned paths'];?> <span class="info" title="<?php echo $t['Slash prefixed comma...'];?>">[?]</span><br>
-<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedPaths" value="<?php echo implode(", ",$ICEcoder["bannedPaths"]); ?>"><br>
-<input type="hidden" name="changedFileSettings" value="false">
-<?php echo $t['ip addresses'];?> <span class="info" title="<?php echo $t['Comma delimited'];?>">[?]</span><br>
-<input type="text" onkeydown="showButton()" name="allowedIPs" value="<?php echo implode(", ",$ICEcoder["allowedIPs"]); ?>"><br>
+<div class="tabContainer">
+	<div id="generalTab" class="tab tabActive" onclick="switchTab('general')">General</div>
+	<div id="styleTab" class="tab" onclick="switchTab('style')">Style</div>
+	<div id="accountsTab" class="tab" onclick="switchTab('accounts')">Accounts</div>
+	<div id="securityTab" class="tab" onclick="switchTab('security')">Security</div>
 </div>
 
-<div class="settingsColumn2">
-<h2><?php echo $t['style'];?></h2>
-<?php echo $t['theme'];?><br>
-<select onchange="selectTheme();showButton()" id="select" name="theme" style="width: 95px">
-    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
-<?php
-for ($i=0;$i<count($themeArray);$i++) {
-	$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
-	echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
-}
-?>
-</select>
+<div id="generalSection" class="section" style="display: block">
 
-<span style="position: absolute; margin: -15px 0 0 15px">
-	<?php echo $t['indent type'];?><br>
-	<select onchange="showButton()" name="indentWithTabs">
-		<option value="true"<?php if($ICEcoder["indentWithTabs"]) {echo " selected";};?>>tabs</option>
-		<option value="false"<?php if(!$ICEcoder["indentWithTabs"]) {echo " selected";};?>>spaces</option>
-	</select>
-</span>
+	<div style="display: inline-block; margin-right: 40px">
 
-<span style="position: absolute; margin: -15px 0 0 100px">
-	<?php echo $t['indent size'];?><br>
-	<input type="text" name="indentSize" id="indentSize" style="width: 30px" onkeydown="showButton()" onkeyup="changeIndentSize()" value="<?php echo $ICEcoder["indentSize"];?>">
-</span>
+		<h2>language</h2><br>
+		<select onchange="showButton()" name="languageUser">
+		<?php
+		$langFiles = array("chinese-simplified.php","chinese-traditional.php","dutch.php","english.php","french.php","german.php","italian.php","norwegian.php","persian.php","portuguese-brazilian.php","spanish.php");
+		$langText = array("中国（简体）","中國（繁體）","Nederlands","English","Français","Deutsch","Italiano","Norsk","فارسی","Portugues(br)","Espa&ntilde;ol");
+		for ($i=0; $i<count($langFiles); $i++) {
+			echo '<option value="'.$langFiles[$i].'"'.($ICEcoder["languageUser"]==$langFiles[$i] ? ' selected' : '').'>'.$langText[$i].'</option>'.PHP_EOL;
+		}
+		?>
+		</select> <span class="info" style="display: inline-block; padding-top: 2px" title="Reload required after changing">[?]</span>
+		<br><br>
 
-<span style="position: absolute; margin: -15px 0 15px 175px">
-	<?php echo $t['auto indent'];?><br>
-	<select onchange="showButton()" name="indentAuto">
-		<option value="true"<?php if($ICEcoder["indentAuto"]) {echo " selected";};?>>yes</option>
-		<option value="false"<?php if(!$ICEcoder["indentAuto"]) {echo " selected";};?>>no</option>
-	</select>
-</span>
-<br>
-<span style="position: absolute; margin: 5px 0 0 0">
-	<?php echo $t['line wrapping'];?><br>
-	<select onchange="showButton()" name="lineWrapping">
-		<option value="true"<?php if($ICEcoder["lineWrapping"]) {echo " selected";};?>>yes</option>
-		<option value="false"<?php if(!$ICEcoder["lineWrapping"]) {echo " selected";};?>>no</option>
-	</select>
-</span>
+		<h2><?php echo $t['functionality'];?></h2><br>
+		<input type="checkbox" onclick="showButton()" name="checkUpdates" value="true"<?php if($ICEcoder["checkUpdates"]) {echo ' checked';};?>> <?php echo $t['check for updates...'];?><br>
+		<input type="checkbox" onclick="showButton()" name="openLastFiles" value="true"<?php if($ICEcoder["openLastFiles"]) {echo ' checked';};?>> <?php echo $t['auto open last...'];?><br>
+		<input type="checkbox" onclick="showButton()" name="updateDiffOnSave" value="true"<?php if($ICEcoder["updateDiffOnSave"]) {echo ' checked';};?>> update diff pane on save
+		<br><br>
 
-<span style="position: absolute; margin: 5px 0 0 95px">
-	<?php echo $t['font size'];?><br>
-	<input type="text" name="fontSize" id="fontSize" style="width: 44px" onkeydown="showButton()" onkeyup="changeFontSize()" value="<?php echo $ICEcoder["fontSize"];?>">
-</span>
+		<h2><?php echo $t['assisting'];?></h2><br>
+		<input type="checkbox" onclick="showButton()" name="codeAssist" value="true"<?php if($ICEcoder["codeAssist"]) {echo ' checked';};?>> <?php echo $t['code assist'];?><br>
+		<br>
+		<?php echo $t['tag wrapper command'];?><br>
+		<select onchange="showButton()" name="tagWrapperCommand">
+			<option value="ctrl+alt"<?php if($ICEcoder["tagWrapperCommand"]=='ctrl+alt') {echo " selected";};?>>ctrl/cmd + alt</option>
+			<option value="alt-left"<?php if($ICEcoder["tagWrapperCommand"]=='alt-left') {echo " selected";};?>>alt left</option>
+		</select>
+		<br><br>
 
-<br><br><br><br>
+		<?php echo $t['auto-complete on'];?><br>
+		<select onchange="showButton()" name="autoComplete">
+			<option value="ctrl+space"<?php if($ICEcoder["autoComplete"]=='ctrl+space') {echo " selected";};?>>ctrl/cmd + space</option>
+			<option value="keypress"<?php if($ICEcoder["autoComplete"]=='keypress') {echo " selected";};?>>keypress</option>
+		</select>
+		<br><br>
 
-<textarea id="code" name="code">
+	</div>
+
+	<div style="display: inline-block">
+
+		<h2>find &amp; replace</h2><br>
+		<?php echo $t['when finding in...'];?>:<br>
+		<input type="text" onkeydown="showButton()" name="findFilesExclude" style="width: 300px" value="<?php echo implode(", ",$ICEcoder["findFilesExclude"]); ?>">
+		<br><br>
+
+		<h2><?php echo $t['bug reporting'];?></h2><br>
+		<?php echo $t['check in files'];?> <span class="info" title="<?php echo $t['Slash prefixed comma...'];?>">[?]</span><br>
+		<input type="text" name="bugFilePaths" style="width: 300px" onkeydown="showButton()" value="<?php echo implode(", ",$ICEcoder["bugFilePaths"]);?>"><br>
+		<span style="display: inline-block; padding: 6px 5px 0 0">...<?php echo $t['every'];?></span>
+		<input type="text" name="bugFileCheckTimer" style="width: 50px; margin-top: 3px" onkeydown="showButton()" value="<?php echo $ICEcoder["bugFileCheckTimer"];?>">
+		<span style="display: inline-block; padding: 6px 5px 0 5px"><?php echo $t['secs getting last'];?></span>
+		<input type="text" name="bugFileMaxLines" style="width: 50px; margin-top: 3px" onkeydown="showButton()" value="<?php echo $ICEcoder["bugFileMaxLines"];?>">
+		<span style="display: inline-block; padding: 6px 5px 0 5px"><?php echo $t['lines'];?></span>
+		<br><br>
+
+		<h2><?php echo $t['file manager'];?></h2><br>
+		<?php echo $t['root'];?> <span class="info" title="<?php echo $t['Slash prefixed'];?>">[?]</span><br>
+		<input type="text" name="root" style="width: 300px" onkeydown="document.settings.changedFileSettings.value='true';showButton()" value="<?php echo $ICEcoder["root"];?>">
+		<br><br>
+
+	</div>
+</div>
+
+<div id="styleSection" class="section" style="display: none">
+
+	<div style="display: inline-block; width: 400px; margin-right: 40px">
+		<div style="height: 220px">
+			<h2>preview</h2><br>
+			<textarea id="code" name="code">
 function findSequence(goal) {
 	function find(start,history) {
 		if (start==goal)
-			return history;
+				return history;
 		else if (start>goal)
 			return null;
 		else
@@ -198,38 +176,84 @@ function findSequence(goal) {
 	}
 	return find(1,"1");
 }</textarea>
-<br>
+		</div>
+		<br><br>
 
-<span style="position: absolute; top: 325px">
-
-	<div style="position: relative; display: inline-block; margin-right: 20px">
-		<h2><?php echo $t['layout'];?></h2>
+		<h2><?php echo $t['layout'];?></h2><br>
+		<input type="checkbox" onclick="showButton()" name="lockedNav" value="true"<?php if($ICEcoder["lockedNav"]) {echo ' checked';};?>> <?php echo $t['locked nav'];?><br><br>
 		<?php echo $t['plugin panel aligned'];?><br>
 		<select onchange="showButton()" name="pluginPanelAligned">
 			<option value="left"<?php if($ICEcoder["pluginPanelAligned"] == "left") {echo " selected";};?>>left</option>
 			<option value="right"<?php if($ICEcoder["pluginPanelAligned"] == "right") {echo " selected";};?>>right</option>
 		</select>
+		<br><br>
+
 	</div>
 
-	<div style="position: relative; display: inline-block">
-		<h2><?php echo $t['file manager'];?></h2>
-		<?php echo $t['root'];?> <span class="info" title="<?php echo $t['Slash prefixed'];?>">[?]</span><br>
-		<input type="text" name="root" style="width: 200px" onkeydown="document.settings.changedFileSettings.value='true';showButton()" value="<?php echo $ICEcoder["root"];?>">
+	<div style="display: inline-block">
+		<h2><?php echo $t['style'];?></h2><br>
+		<?php echo $t['theme'];?><br>
+		<select onchange="selectTheme();showButton()" id="select" name="theme" style="width: 95px">
+		    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
+		<?php
+		for ($i=0;$i<count($themeArray);$i++) {
+			$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
+			echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
+		}
+		?>
+		</select>
+		<br><br>
+
+		<?php echo $t['font size'];?><br>
+		<input type="text" name="fontSize" id="fontSize" style="width: 44px" onkeydown="showButton()" onkeyup="changeFontSize()" value="<?php echo $ICEcoder["fontSize"];?>">
+		<br><br>
+
+		<?php echo $t['indent size'];?><br>
+		<input type="text" name="indentSize" id="indentSize" style="width: 44px" onkeydown="showButton()" onkeyup="changeIndentSize()" value="<?php echo $ICEcoder["indentSize"];?>">
+		<br><br>
+
+		<input type="checkbox" onclick="showButton();showHideTabs()" name="visibleTabs" value="true"<?php if($ICEcoder["visibleTabs"]) {echo ' checked';};?>> <?php echo $t['visible tabs'];?>
+		<br><br>
+
+		<?php echo $t['line wrapping'];?><br>
+		<select onchange="showButton()" name="lineWrapping">
+			<option value="true"<?php if($ICEcoder["lineWrapping"]) {echo " selected";};?>>yes</option>
+			<option value="false"<?php if(!$ICEcoder["lineWrapping"]) {echo " selected";};?>>no</option>
+		</select>
+		<br><br>
+
+		<h2><?php echo $t['functionality'];?></h2><br>
+
+		<?php echo $t['indent type'];?><br>
+		<select onchange="showButton()" name="indentWithTabs">
+			<option value="true"<?php if($ICEcoder["indentWithTabs"]) {echo " selected";};?>>tabs</option>
+			<option value="false"<?php if(!$ICEcoder["indentWithTabs"]) {echo " selected";};?>>spaces</option>
+		</select>
+		<br><br>
+
+		<?php echo $t['auto indent'];?><br>
+		<select onchange="showButton()" name="indentAuto">
+			<option value="true"<?php if($ICEcoder["indentAuto"]) {echo " selected";};?>>yes</option>
+			<option value="false"<?php if(!$ICEcoder["indentAuto"]) {echo " selected";};?>>no</option>
+		</select>
+		<br><br>
+
 	</div>
+
+</div>
+
+<div id="accountsSection" class="section" style="display: none">
+
+	<h2>password</h2><br>
+	<?php echo $t['new password'];?> <span class="info" title="<?php echo $t['8 chars min'];?>">[?]</span><br>
+	<input type="password" name="password" style="width: 320px" onkeydown="showButton()">
 	<br><br>
 
-	<h2><?php echo $t['bug reporting'];?></h2>
-	<?php echo $t['check in files'];?> <span class="info" title="<?php echo $t['Slash prefixed comma...'];?>">[?]</span><br>
-	<input type="text" name="bugFilePaths" style="width: 120px" onkeydown="showButton()" value="<?php echo implode(", ",$ICEcoder["bugFilePaths"]);?>">
-	<span style="display: inline-block; padding: 4px 5px 0 5px"><?php echo $t['every'];?></span>
-	<input type="text" name="bugFileCheckTimer" style="width: 50px" onkeydown="showButton()" value="<?php echo $ICEcoder["bugFileCheckTimer"];?>">
-	<span style="display: inline-block; padding: 4px 5px 0 5px"><?php echo $t['secs getting last'];?></span>
-	<input type="text" name="bugFileMaxLines" style="width: 50px" onkeydown="showButton()" value="<?php echo $ICEcoder["bugFileMaxLines"];?>">
-	<span style="display: inline-block; padding: 4px 5px 0 5px"><?php echo $t['lines'];?></span>
+	<?php echo $t['confirm password'];?><br>
+	<input type="password" name="passwordConfirm" style="width: 320px" onkeydown="showButton()">
 	<br><br>
 
-	<div>
-	<h2><?php echo $t['multi-user'];?> <span class="info" title="<?php echo $t['Make sure you...'];?>">[?]</span></h2>
+	<h2><?php echo $t['multi-user'];?> <span class="info" title="<?php echo $t['Make sure you...'];?>">[?]</span></h2><br>
 	<input type="checkbox" name="multiUser" value="true" onclick="showButton();changeEnableRegistrationStatus();"<?php if($ICEcoder["multiUser"]){echo ' checked';} ?>>Multi-User
 	<?php
 		echo '<input type="checkbox" name="enableRegistration" value="true"';
@@ -239,15 +263,28 @@ function findSequence(goal) {
 		}
 		echo ' onclick="showButton()" id="enableRegistration"> '.$t['Registration'].' </input>';
 	?>
-	</div>
-	<br>
+	<br><br>
 
-	<div>
-	<h2>github</h2>
+	<h2>github</h2><br>
 	<?php echo $t['auth token'];?> <span class="info" title="<?php echo $t['Required to get...'];?>">[?]</span> &nbsp; <a href="https://help.github.com/articles/creating-an-access-token-for-command-line-use" target="_blank" class="info">Personal Access Token</a> &nbsp; <a href="(http://developer.github.com/v3/oauth" target="_blank" class="info">Client/Secret Pair Token</a><br>
 	<input type="text" name="githubAuthToken" style="width: 320px" onkeydown="showButton()" value="<?php echo $ICEcoder["githubAuthToken"];?>" autocomplete="off">
-	</div>
-</span>
+</div>
+
+<div id="securitySection" class="section" style="display: none">
+	<h2><?php echo $t['security'];?></h2><br>
+	<?php echo $t['banned files/folders'];?><br>
+	<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedFiles" style="width: 660px" value="<?php echo implode(", ",$ICEcoder["bannedFiles"]); ?>">
+	<br><br>
+
+	<?php echo $t['banned paths'];?> <span class="info" title="<?php echo $t['Slash prefixed comma...'];?>">[?]</span><br>
+	<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedPaths" style="width: 660px" value="<?php echo implode(", ",$ICEcoder["bannedPaths"]); ?>">
+	<br><br>
+
+	<input type="hidden" name="changedFileSettings" value="false">
+	<?php echo $t['ip addresses'];?> <span class="info" title="<?php echo $t['Comma delimited'];?>">[?]</span><br>
+	<input type="text" onkeydown="showButton()" name="allowedIPs" style="width: 660px" value="<?php echo implode(", ",$ICEcoder["allowedIPs"]); ?>">
+	<br><br>
+</div>
 
 <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
@@ -270,12 +307,14 @@ function changeIndentSize() {
 	var indentSize = document.getElementById("indentSize").value;
 	editor.setOption("indentUnit", indentSize);
 	editor.setOption("tabSize", indentSize);
+	editor.refresh();
 }
 
 function changeFontSize() {
 	cMCSS = document.styleSheets[2];
 	cMCSS.rules ? strCSS = 'rules' : strCSS = 'cssRules';
 	cMCSS[strCSS][0].style['fontSize'] = document.getElementById("fontSize").value;
+	editor.refresh();
 }
 
 var changeEnableRegistrationStatus = function(){
@@ -303,12 +342,18 @@ var validatePasswords = function() {
 		}
 	}
 }
+
+tabNames = ['general','style','accounts','security'];
+var switchTab = function(tab) {
+	for (var i=0; i<tabNames.length; i++) {
+		document.getElementById(tabNames[i]+'Tab').className = tabNames[i] == tab ? "tab tabActive" : "tab";
+		document.getElementById(tabNames[i]+'Section').style.display = tabNames[i] == tab ? "block" : "none";
+	}
+	editor.refresh();
+}
 </script>
 
 <div class="update" id="updateButton" onClick="<?php echo $ICEcoder['demoMode'] ? "top.ICEcoder.message('Sorry, can\'t commit settings in demo mode')" : "validatePasswords()"; ?>">update</div>
-
-</div>
-
 <input type="hidden" name="csrf" value="<?php echo $_SESSION["csrf"]; ?>">
 </form>