diff --git a/resources/templates/account.html b/resources/templates/account.html
index 5ff1e9c..fe4348f 100644
--- a/resources/templates/account.html
+++ b/resources/templates/account.html
@@ -1,17 +1,16 @@
-{% extends "layout.html" %}
+{% extends "account_base.html" %}
{% block title %}Manage Account{% endblock %}
+{% set current_page = "home" %}
-{% block body %}
-
Managing account {{ username }}
-Logout
-Change Password
-Cancel Account
-
+{% block accountbody %}
+Upload Character Backup
{% endblock %}
diff --git a/resources/templates/account_base.html b/resources/templates/account_base.html
new file mode 100644
index 0000000..9cbebdf
--- /dev/null
+++ b/resources/templates/account_base.html
@@ -0,0 +1,41 @@
+{% extends "layout.html" %}
+
+{% block body %}
+
+
+
+ Manage Account
+
+
+
+
+
+ {{ username }}
+
+
+
+ {% block accountbody %}{% endblock %}
+
+
+{% endblock %}
diff --git a/resources/templates/changepassword.html b/resources/templates/changepassword.html
index f2f55d8..3874900 100644
--- a/resources/templates/changepassword.html
+++ b/resources/templates/changepassword.html
@@ -1,8 +1,9 @@
-{% extends "layout.html" %}
+{% extends "account_base.html" %}
{% block title %}Kawari - Change Password{% endblock %}
+{% set current_page = "changepassword" %}
-{% block body %}
+{% block accountbody %}