diff --git a/views/settings.erb b/views/settings.erb
index deaa5499..a5ad2212 100644
--- a/views/settings.erb
+++ b/views/settings.erb
@@ -22,109 +22,67 @@
 					</div>
 				<% end %>
 			</div>
+<!--
+      <ul class="nav nav-tabs">
+        <li class="active">
+          <a href="#">Plan</a>
+        </li>
+        <li>
+          <a href="#">Profile</a>
+        </li>
+        <li>
+          <a href="">Custom Domain</a>
+        </li>
+        <li>
+          <a href="">Password</a>
+        </li>
+        <li>
+          <a href="">Email</a>
+        </li>
+        <li>
+          <a href="">Username</a>
+        </li>
+        <li>
+          <a href="">18+</a>
+        </li>
+      </ul>
+-->
 
-			<h2>Neocities Plan</h2>
-      <% if current_site.supporter? && !current_site.plan_ended %>
-     		<p class="tiny">You currently have the <strong>Supporter Plan (<%= current_site.maximum_space_in_megabytes %>MB)</strong>. Thank you! We love you.
-     		</p>
-      	<a class="btn-Action" href="/plan">Manage Plan</a>
-    	<% else %>
-      	<p class="tiny">
-      		You currently have the <strong>Free Plan (<%= current_site.maximum_space_in_megabytes %>MB)</strong>.<br>Want to get more space and help Neocities? Become a supporter!
-      	</p>
-      	<a class="btn-Action" href="/plan">Supporter Info</a>
-      <% end %>
-
-      <h2>Site Profile</h2>
-      <div>
-        <form method="POST" action="/settings/profile">
-          <%== csrf_token_input_html %>
-          <p>
-            <input name="site[profile_comments_enabled]" type="hidden" value="true">
-            <input name="site[profile_comments_enabled]" type="checkbox" value="false"
-              <% if current_site.profile_comments_enabled == false %>checked<% end %>
-            > Turn off profile comments
-          </p>
-
-          <input class="btn-Action" type="submit" value="Update Site Profile Settings">
-        </form>
+      <div class="tabbable" style="margin-top: 20px"> <!-- Only required for left/right tabs -->
+        <ul class="nav nav-tabs">
+          <li class="active"><a href="#plan" data-toggle="tab">Plan</a></li>
+          <li><a href="#profile" data-toggle="tab">Profile</a></li>
+          <li><a href="#customdomain" data-toggle="tab">Custom Domain</a></li>
+          <li><a href="#password" data-toggle="tab">Password</a></li>
+          <li><a href="#email" data-toggle="tab">Email</a></li>
+          <li><a href="#username" data-toggle="tab">Username</a></li>
+          <li><a href="#nsfw" data-toggle="tab">18+</a></li>
+        </ul>
+        <div class="tab-content">
+          <div class="tab-pane active" id="plan">
+            <%== erb :'settings/plan' %>
+          </div>
+          <div class="tab-pane" id="profile">
+            <%== erb :'settings/profile' %>
+          </div>
+          <div class="tab-pane" id="customdomain">
+            <%== erb :'settings/custom_domain' %>
+          </div>
+          <div class="tab-pane" id="password">
+            <%== erb :'settings/password' %>
+          </div>
+          <div class="tab-pane" id="email">
+            <%== erb :'settings/email' %>
+          </div>
+          <div class="tab-pane" id="username">
+            <%== erb :'settings/username' %>
+          </div>
+          <div class="tab-pane" id="nsfw">
+            <%== erb :'settings/nsfw' %>
+          </div>
+        </div>
       </div>
 
-      <h2>Custom Domain</h2>
-      <p>
-      	You can configure a custom domain for your Neocities site! <strong><a href="/custom_domain">Click Here</a></strong> for more information.
-      </p>
-
-     	<h2>Change Password</h2>
-     	<form method="POST" action="/change_password">
-     		<%== csrf_token_input_html %>
-
-     		<p>Current Password:</p>
-     		<input class="input-Area" name="current_password" type="password">
-
-     		<p>New Password:</p>
-     		<input class="input-Area" name="new_password" type="password">
-
-     		<p>Confirm New Password:</p>
-     		<input class="input-Area" name="new_password_confirm" type="password">
-
-     		<input class="btn-Action" type="submit" value="Change Password">
-     	</form>
-
-      <h2>Change Email</h2>
-      <form method="POST" action="/change_email">
-        <%== csrf_token_input_html %>
-
-        <p>Current Email: <strong><%= current_site.email %></strong></p>
-        <p>New Email:</p>
-        <input class="input-Area" name="email" type="text">
-
-        <div>
-          <input class="btn-Action" type="submit" value="Change Email">
-        </div>
-      </form>
-
-     	<h2>Change Site (User) Name</h2>
-     	<form method="POST" action="/change_name">
-     		<%== csrf_token_input_html %>
-     		<p class="tiny">
-     			It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
-     		</p>
-
-     		<p>
-     			Current Name:
-     			<span style="color: green"><strong><%= current_site.username %></strong></span>
-     		</p>
-
-     		<p>
-     			New name:
-     			<input name="name" class="input-Area" type="text" placeholder="newname" style="width: 200px">
-     		</p>
-
-     		<input class="btn-Action" type="submit" value="Change Name">
-     	</form>
-
-
-     	<h2>18+ Content</h2>
-
-     	<p class="tiny">
-     		If your site contains objectionable (18+) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines 18+ content yet, but basically it's just pornography and lewd/sick/gross images. Thanks for your patience and understanding as we try to find a way to balance out the needs of everyone.
-     	</p>
-
-     	<form method="POST" action="/change_nsfw">
-     		<%== csrf_token_input_html %>
-     		<input name="is_nsfw" type="hidden" value="false">
-     		<p>
-     			<strong>
-     				My page has 18+ content:&nbsp;&nbsp;&nbsp;
-     				<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px"
-     					<% if current_site.is_nsfw %>checked<% end %>
-     				>
-     			</strong>
-     		</p>
-
-     		<input class="btn-Action" type="submit" value="Update">
-     	</form>
 <!--
       <h2>Delete Site</h2>
         <p class="tiny">
diff --git a/views/settings/custom_domain.erb b/views/settings/custom_domain.erb
new file mode 100644
index 00000000..05d635aa
--- /dev/null
+++ b/views/settings/custom_domain.erb
@@ -0,0 +1,4 @@
+<h2>Custom Domain</h2>
+<p>
+  You can configure a custom domain for your Neocities site! <strong><a href="/custom_domain">Click Here</a></strong> for more information.
+</p>
\ No newline at end of file
diff --git a/views/settings/email.erb b/views/settings/email.erb
new file mode 100644
index 00000000..bf767c60
--- /dev/null
+++ b/views/settings/email.erb
@@ -0,0 +1,12 @@
+<h2>Change Email</h2>
+<form method="POST" action="/change_email">
+  <%== csrf_token_input_html %>
+
+  <p>Current Email: <strong><%= current_site.email %></strong></p>
+  <p>New Email:</p>
+  <input class="input-Area" name="email" type="text">
+
+  <div>
+    <input class="btn-Action" type="submit" value="Change Email">
+  </div>
+</form>
\ No newline at end of file
diff --git a/views/settings/nsfw.erb b/views/settings/nsfw.erb
new file mode 100644
index 00000000..a7ae1300
--- /dev/null
+++ b/views/settings/nsfw.erb
@@ -0,0 +1,20 @@
+<h2>18+ Content</h2>
+
+<p class="tiny">
+  If your site contains objectionable (18+) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines 18+ content yet, but basically it's just pornography and lewd/sick/gross images. Thanks for your patience and understanding as we try to find a way to balance out the needs of everyone.
+</p>
+
+<form method="POST" action="/change_nsfw">
+  <%== csrf_token_input_html %>
+  <input name="is_nsfw" type="hidden" value="false">
+  <p>
+    <strong>
+      My page has 18+ content:&nbsp;&nbsp;&nbsp;
+      <input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px"
+        <% if current_site.is_nsfw %>checked<% end %>
+      >
+    </strong>
+  </p>
+
+  <input class="btn-Action" type="submit" value="Update">
+</form>
\ No newline at end of file
diff --git a/views/settings/password.erb b/views/settings/password.erb
new file mode 100644
index 00000000..d13992e9
--- /dev/null
+++ b/views/settings/password.erb
@@ -0,0 +1,15 @@
+<h2>Change Password</h2>
+<form method="POST" action="/change_password">
+  <%== csrf_token_input_html %>
+
+  <p>Current Password:</p>
+  <input class="input-Area" name="current_password" type="password">
+
+  <p>New Password:</p>
+  <input class="input-Area" name="new_password" type="password">
+
+  <p>Confirm New Password:</p>
+  <input class="input-Area" name="new_password_confirm" type="password">
+
+  <input class="btn-Action" type="submit" value="Change Password">
+</form>
\ No newline at end of file
diff --git a/views/settings/plan.erb b/views/settings/plan.erb
new file mode 100644
index 00000000..42fce88b
--- /dev/null
+++ b/views/settings/plan.erb
@@ -0,0 +1,11 @@
+<h2>Neocities Plan</h2>
+<% if current_site.supporter? && !current_site.plan_ended %>
+  <p class="tiny">You currently have the <strong>Supporter Plan (<%= current_site.maximum_space_in_megabytes %>MB)</strong>. Thank you! We love you.
+  </p>
+  <a class="btn-Action" href="/plan">Manage Plan</a>
+<% else %>
+  <p class="tiny">
+    You currently have the <strong>Free Plan (<%= current_site.maximum_space_in_megabytes %>MB)</strong>.<br>Want to get more space and help Neocities? Become a supporter!
+  </p>
+  <a class="btn-Action" href="/plan">Supporter Info</a>
+<% end %>
\ No newline at end of file
diff --git a/views/settings/profile.erb b/views/settings/profile.erb
new file mode 100644
index 00000000..db9213b0
--- /dev/null
+++ b/views/settings/profile.erb
@@ -0,0 +1,14 @@
+<h2>Site Profile</h2>
+<div>
+  <form method="POST" action="/settings/profile">
+    <%== csrf_token_input_html %>
+    <p>
+      <input name="site[profile_comments_enabled]" type="hidden" value="true">
+      <input name="site[profile_comments_enabled]" type="checkbox" value="false"
+        <% if current_site.profile_comments_enabled == false %>checked<% end %>
+      > Turn off profile comments
+    </p>
+
+    <input class="btn-Action" type="submit" value="Update Site Profile Settings">
+  </form>
+</div>
\ No newline at end of file
diff --git a/views/settings/username.erb b/views/settings/username.erb
new file mode 100644
index 00000000..4726177c
--- /dev/null
+++ b/views/settings/username.erb
@@ -0,0 +1,19 @@
+<h2>Change Site (User) Name</h2>
+<form method="POST" action="/change_name">
+  <%== csrf_token_input_html %>
+  <p class="tiny">
+    It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
+  </p>
+
+  <p>
+    Current Name:
+    <span style="color: green"><strong><%= current_site.username %></strong></span>
+  </p>
+
+  <p>
+    New name:
+    <input name="name" class="input-Area" type="text" placeholder="newname" style="width: 200px">
+  </p>
+
+  <input class="btn-Action" type="submit" value="Change Name">
+</form>
\ No newline at end of file