diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e55c115..92a7ab2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
         <activity
             android:name=".notes.NotesActivity"
             android:exported="false"
-            android:label="@string/title_activity_notes"
-            android:theme="@style/Theme.CpsAssist.NoActionBar" />
+            android:label="@string/title_activity_notes"/>
+        <activity android:name=".main.MainActivity"/>
         <activity
             android:name=".login.LoginActivity"
             android:exported="true">
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java
new file mode 100644
index 0000000..5d0c588
--- /dev/null
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/BtnID.java
@@ -0,0 +1,9 @@
+package xyz.r0r5chach.cpsAssist;
+
+public enum BtnID {
+    ADD_BUTTON,
+    EDIT_BUTTON,
+    DELETE_BUTTON,
+    NOTES_BUTTON,
+    QUIZ_BUTTON
+}
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java
index dc58ff0..b8343dc 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java
@@ -7,6 +7,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import xyz.r0r5chach.cpsAssist.ArrayTools;
+import xyz.r0r5chach.cpsAssist.main.MainActivity;
 import xyz.r0r5chach.cpsAssist.notes.NotesActivity;
 /**
  * This Class defines the definition of the OnCLickListener for the LoginActivity
@@ -53,7 +54,7 @@ public class BtnOnClickListener implements View.OnClickListener{
         }
 
         if (isUser(inputs)) {
-            Intent home = new Intent(view.getContext(), NotesActivity.class);
+            Intent home = new Intent(view.getContext(), MainActivity.class);
             home.putExtra("username", inputs[0]);
             view.getContext().startActivity(home);
             Activity login = (Activity) view.getContext();
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java
new file mode 100644
index 0000000..ff86637
--- /dev/null
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/BtnOnClickListener.java
@@ -0,0 +1,32 @@
+package xyz.r0r5chach.cpsAssist.main;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+
+import java.util.Locale;
+
+import xyz.r0r5chach.cpsAssist.BtnID;
+import xyz.r0r5chach.cpsAssist.quiz.QuizActivity;
+import xyz.r0r5chach.cpsAssist.notes.NotesActivity;
+
+public class BtnOnClickListener implements View.OnClickListener{
+    @Override
+    public void onClick(View v) {
+        String id = v.getResources().getResourceName(v.getId()).split("/")[1];
+        Intent intent = null;
+        switch(BtnID.valueOf(id.toUpperCase(Locale.ROOT))) {
+            case NOTES_BUTTON:
+                intent = new Intent(v.getContext(), NotesActivity.class);
+                break;
+            case QUIZ_BUTTON:
+                intent = new Intent(v.getContext(), QuizActivity.class);
+                break;
+        }
+        Activity main = (Activity) v.getContext();
+        if (intent != null) {
+            intent.putExtra("username", main.getIntent().getStringExtra("username"));
+            main.startActivity(intent);
+        }
+    }
+}
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java
new file mode 100644
index 0000000..0d761fe
--- /dev/null
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/main/MainActivity.java
@@ -0,0 +1,23 @@
+package xyz.r0r5chach.cpsAssist.main;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import xyz.r0r5chach.cpsAssist.R;
+import xyz.r0r5chach.cpsAssist.main.BtnOnClickListener;
+
+public class MainActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        setTitle("Home- " + getIntent().getStringExtra("username"));
+        findViewById(R.id.notes_button).setOnClickListener(new BtnOnClickListener());
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+}
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnID.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnID.java
deleted file mode 100644
index e710f9f..0000000
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnID.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package xyz.r0r5chach.cpsAssist.notes;
-
-public enum BtnID {
-    ADD_BUTTON,
-    EDIT_BUTTON,
-    DELETE_BUTTON
-}
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnOnClickListener.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnOnClickListener.java
index 662cf2a..d80dd51 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnOnClickListener.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/BtnOnClickListener.java
@@ -9,12 +9,11 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 
-import org.w3c.dom.Text;
-
 import java.io.File;
 import java.util.Locale;
 import java.util.Scanner;
 
+import xyz.r0r5chach.cpsAssist.BtnID;
 import xyz.r0r5chach.cpsAssist.R;
 
 
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Notes.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Notes.java
index d150593..ae74885 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Notes.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Notes.java
@@ -24,7 +24,11 @@ public class Notes {
     }
 
     private void getStoredNotes() {
-        notes.addAll(Arrays.asList(Objects.requireNonNull(rootDir.listFiles())));
+        for (File note: Objects.requireNonNull(rootDir.listFiles())) {
+            if (note.getName().contains(username)) {
+                notes.add(note);
+            }
+        }
     }
 
     public void createNote() {
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java
index 6345b7d..d4a73b2 100644
--- a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java
@@ -17,6 +17,7 @@ public class NotesActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_notes);
         initRecycler();
+        setTitle("Notes- " + getIntent().getStringExtra("username"));
         findViewById(R.id.add_Button).setOnClickListener(new BtnOnClickListener(adapter));
     }
 
diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/quiz/QuizActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/quiz/QuizActivity.java
new file mode 100644
index 0000000..34e25af
--- /dev/null
+++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/quiz/QuizActivity.java
@@ -0,0 +1,4 @@
+package xyz.r0r5chach.cpsAssist.quiz;
+
+public class QuizActivity {
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..bef4efa
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/notes_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/note_edit_hint" />
+
+    <Button
+        android:id="@+id/quiz_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quiz_button_text" />
+</LinearLayout>
\ No newline at end of file