diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 226ca8a..79321cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Electricity"
         tools:targetApi="31">
+        <activity
+            android:name=".ChangeUsername"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
         <activity
             android:name=".Settings"
             android:exported="false">
diff --git a/app/src/main/java/com/example/electricity/ChangeUsername.java b/app/src/main/java/com/example/electricity/ChangeUsername.java
new file mode 100644
index 0000000..3a09f34
--- /dev/null
+++ b/app/src/main/java/com/example/electricity/ChangeUsername.java
@@ -0,0 +1,26 @@
+package com.example.electricity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.ImageView;
+
+public class ChangeUsername extends AppCompatActivity {
+    ImageView back;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_change_username);
+        back = findViewById(R.id.imageView30);
+        back();
+    }
+
+    public void back() {
+        back.setOnClickListener(view -> {
+            Intent intent = new Intent(this, Settings.class);
+            startActivity(intent);
+            finish();
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/electricity/Settings.java b/app/src/main/java/com/example/electricity/Settings.java
index 3fcce37..7b7b2d8 100644
--- a/app/src/main/java/com/example/electricity/Settings.java
+++ b/app/src/main/java/com/example/electricity/Settings.java
@@ -4,15 +4,18 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Button;
 import android.widget.ImageView;
 
 public class Settings extends AppCompatActivity {
     ImageView back;
+    Button changeUsername;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
         back = findViewById(R.id.imageView24);
+        changeUsername = findViewById(R.id.button6);
         back();
     }
 
@@ -22,4 +25,11 @@ public class Settings extends AppCompatActivity {
             startActivity(intent);
         });
     }
+
+    public void changeUsername() {
+        changeUsername.setOnClickListener(view -> {
+            Intent intent = new Intent(this, ChangeUsername.class);
+            startActivity(intent);
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_change_username.xml b/app/src/main/res/layout/activity_change_username.xml
new file mode 100644
index 0000000..7a09a6d
--- /dev/null
+++ b/app/src/main/res/layout/activity_change_username.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ChangeUsername">
+
+    <ImageView
+        android:id="@+id/imageView19"
+        android:layout_width="515dp"
+        android:layout_height="364dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        app:srcCompat="@drawable/rectangle_223" />
+
+    <ImageView
+        android:id="@+id/imageView21"
+        android:layout_width="515dp"
+        android:layout_height="850dp"
+        android:layout_marginTop="60dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/imageView19"
+        app:srcCompat="@drawable/background" />
+
+    <TextView
+        android:id="@+id/textView21"
+        android:layout_width="299dp"
+        android:layout_height="51dp"
+        android:layout_marginStart="30dp"
+        android:text="Change Username"
+        android:textColor="#FFFFFF"
+        android:textSize="30sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView30"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/imageView30"
+        app:layout_constraintTop_toTopOf="@+id/imageView30"
+        app:layout_constraintVertical_bias="0.363" />
+
+    <ImageView
+        android:id="@+id/imageView30"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/imageView19"
+        app:layout_constraintVertical_bias="0.0"
+        app:srcCompat="@drawable/pngwing_com" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c2ed777..3222d32 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/imageView3"
-        android:layout_width="531dp"
-        android:layout_height="893dp"
+        android:layout_width="501dp"
+        android:layout_height="1168dp"
         android:background="@drawable/layout_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 7759843..2540061 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -120,4 +120,14 @@
         app:layout_constraintTop_toTopOf="@+id/imageView19"
         app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/pngwing_com" />
+
+    <ImageView
+        android:id="@+id/imageView26"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button10"
+        app:srcCompat="@drawable/_62259e2c38dcf93b9346f7be0a4a82_1" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_usage.xml b/app/src/main/res/layout/activity_usage.xml
index c80415a..179b3d2 100644
--- a/app/src/main/res/layout/activity_usage.xml
+++ b/app/src/main/res/layout/activity_usage.xml
@@ -77,7 +77,7 @@
       android:id="@+id/textView17"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="35dp"
+      android:layout_marginStart="40dp"
       android:layout_marginTop="50dp"
       android:text="Week"
       android:textColor="#000000"
@@ -93,7 +93,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="50dp"
-      android:layout_marginEnd="35dp"
+      android:layout_marginEnd="40dp"
       android:text="Month"
       android:textColor="#4CAF50"
       android:textSize="20sp"
@@ -175,13 +175,13 @@
   <ImageView
       android:id="@+id/imageView34"
       android:layout_width="wrap_content"
-      android:layout_height="445dp"
-      android:layout_marginTop="100dp"
+      android:layout_height="0dp"
+      android:layout_marginTop="60dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_bias="1.0"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="@+id/imageView23"
+      app:layout_constraintTop_toTopOf="@+id/imageView28"
       app:srcCompat="@drawable/group_2666" />
 
   <ImageView
@@ -212,7 +212,7 @@
       android:id="@+id/button7"
       android:layout_width="180dp"
       android:layout_height="50dp"
-      android:layout_marginTop="200dp"
+      android:layout_marginTop="180dp"
       android:backgroundTint="#4CAF50"
       android:text="View Plan"
       android:textAllCaps="false"
@@ -222,6 +222,6 @@
       app:layout_constraintHorizontal_bias="0.497"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/textView20"
-      app:layout_constraintVertical_bias="0.0" />
+      app:layout_constraintVertical_bias="0.014" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a56e2b3..63f1de3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    ]   <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar" />
+    ]   <style name="AppTheme" parent="Theme.AppCompat.DayNight" />
 </resources>
\ No newline at end of file