diff --git a/onlylegs/static/sass/components/settings.sass b/onlylegs/static/sass/components/settings.sass
new file mode 100644
index 0000000..cce4ac3
--- /dev/null
+++ b/onlylegs/static/sass/components/settings.sass
@@ -0,0 +1,29 @@
+.settings-content
+    margin: 0.5rem
+    padding: 1rem
+
+    position: relative
+
+    display: flex
+    flex-direction: column
+    justify-content: center
+    gap: 1rem
+
+    background-color: RGB($bg-400)
+    color: RGB($fg-white)
+    border: 2px solid RGB($bg-200)
+    border-radius: $rad-inner
+
+    h2
+        margin: 0
+        padding: 0
+
+        font-size: 1.5rem
+        font-weight: 700
+
+    h3
+        margin: 0
+        padding: 0
+
+        font-size: 1.25rem
+        font-weight: 700
\ No newline at end of file
diff --git a/onlylegs/static/sass/style.sass b/onlylegs/static/sass/style.sass
index 763b3ea..097346c 100644
--- a/onlylegs/static/sass/style.sass
+++ b/onlylegs/static/sass/style.sass
@@ -19,6 +19,7 @@
 @import "components/buttons/block"
 
 @import "components/image-view/view"
+@import "components/settings"
 
 // Reset
 *
diff --git a/onlylegs/templates/settings.html b/onlylegs/templates/settings.html
index 05448ff..1be491a 100644
--- a/onlylegs/templates/settings.html
+++ b/onlylegs/templates/settings.html
@@ -14,17 +14,27 @@
         </div>
     </div>
 
-    <div class="settings-content">
-        <h1>Gwa Gwa</h1>
+    <div class="settings-content" id="profileSettings">
+        <h2>Profile Settings</h2>
+        <form method="POST" action="{{ url_for('api.user_picture', user_id=current_user.id) }}" enctype="multipart/form-data">
+            <h3>Profile Picture</h3>
+            <input type="file" name="file" tab-index="-1"/>
+            <input type="submit" value="Upload" class="btn-block">
+        </form>
+    
+        <form method="POST" action="{{ url_for('api.user_username', user_id=current_user.id) }}" enctype="multipart/form-data">
+            <h3>Username</h3>
+            <input type="text" name="name" class="input-block" value="{{ current_user.username }}" />
+            <input type="submit" value="Upload" class="btn-block"/>
+        </form>
     </div>
 
-    <form method="POST" action="{{ url_for('api.user_picture', user_id=current_user.id) }}" enctype="multipart/form-data">
-        <input type="file" name="file">
-        <input type="submit" value="Upload">
-    </form>
-
-    <form method="POST" action="{{ url_for('api.user_username', user_id=current_user.id) }}" enctype="multipart/form-data">
-        <input type="text" name="name">
-        <input type="submit" value="Upload">
-    </form>
+    <div class="settings-content" id="profileSettings">
+        <h2>Account Settings</h2>    
+        <form method="POST" action="" enctype="multipart/form-data">
+            <h3>Email</h3>
+            <input type="text" name="email" class="input-block" value="{{ current_user.email }}" />
+            <input type="submit" value="Upload" class="btn-block"/>
+        </form>
+    </div>
 {% endblock %}
\ No newline at end of file