diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2e80e7f..300967e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,15 +9,36 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".views.SigninActivity"></activity>
-        <activity android:name=".views.SignupActivity" />
-        <activity android:name=".MainActivity">
+        <activity android:name=".views.SigninActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".views.SignupActivity" />
+        <activity android:name=".MainActivity">
+
+        </activity>
+
+
+        <activity
+            android:name=".views.RequestListActivity"
+            android:label="@string/title_activity_request_list"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+
+        <activity android:name=".views.DisplayQRActivity"></activity>
+        <activity android:name=".views.AddMemberActivity" />
+
+        <activity
+            android:name=".views.GroupList"
+            android:label="@string/title_activity_group_list"
+            android:theme="@style/AppTheme.NoActionBar"></activity>
+
+
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
index 5cd0d4e..fa9dc1b 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -27,7 +27,7 @@
         SigninButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(getApplication(), SignupActivity.class);
+                Intent intent = new Intent(getApplication(), GroupsListActivity.class);
                 startActivity(intent);
                 finish();
             }
diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
index 56ac44b..f4293d6 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -27,7 +27,7 @@
         MakeAccountButton.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v){
-                Intent intent = new Intent(getApplication(), SigninActivity.class);
+                Intent intent = new Intent(getApplication(), GroupsListActivity.class);
                 startActivity(intent);
                 finish();
             }
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index b9ee79c..7416c05 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -15,7 +15,7 @@
         android:layout_marginTop="28dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:text="Sign in"
+        android:text="@string/sign_in"
         android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
@@ -31,14 +31,14 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
+        android:autofillHints=""
         android:ems="10"
-        android:hint="PASSWORD"
+        android:hint="@string/password"
         android:inputType="textPassword"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText"
-        android:autofillHints="" />
+        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText" />
 
     <EditText
         android:id="@+id/EMailAddressText"
@@ -49,14 +49,14 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
+        android:autofillHints=""
         android:ems="10"
-        android:hint="E-MAIL ADDRESS"
+        android:hint="@string/e_mail_address"
         android:inputType="textEmailAddress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2"
-        android:autofillHints="" />
+        app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
     <TextView
         android:id="@+id/textView2"
@@ -67,7 +67,7 @@
         android:layout_marginTop="72dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:text="Sign in"
+        android:text="@string/sign_in"
         android:textAllCaps="false"
         android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -83,7 +83,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:text="Don't have an account?"
+        android:text="@string/don_t_have_an_account"
         app:layout_constraintEnd_toStartOf="@+id/SignupButton"
         app:layout_constraintHorizontal_bias="0.569"
         app:layout_constraintStart_toStartOf="parent"
@@ -99,8 +99,8 @@
         android:layout_marginEnd="64dp"
         android:layout_marginRight="64dp"
         android:background="#00000000"
+        android:text="@string/sign_up_now"
         android:textAllCaps="false"
-        android:text="Sign Up Now"
         android:textColor="#3F51B5"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -129,7 +129,7 @@
         android:layout_marginTop="20dp"
         android:background="#FFFFFF"
         android:gravity="center"
-        android:text="OR"
+        android:text="@string/or"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.489"
@@ -145,8 +145,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
         android:background="#00000000"
-        android:gravity="left"
-        android:text="Forgot Password?"
+        android:text="@string/forgot_password"
         android:textAllCaps="false"
         android:textColor="#3F51B5"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 7d692a2..3088668 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -14,7 +14,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:text="Already have a account?"
+        android:text="@string/already_have_a_account"
         app:layout_constraintEnd_toStartOf="@+id/LoginButton"
         app:layout_constraintHorizontal_bias="0.562"
         app:layout_constraintStart_toStartOf="parent"
@@ -31,7 +31,7 @@
         android:layout_marginRight="116dp"
         android:background="#00000000"
         android:textAllCaps="false"
-        android:text="Login"
+        android:text="@string/login"
         android:textColor="#3F51B5"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +62,7 @@
         android:layout_marginRight="8dp"
         android:background="#FFFFFF"
         android:gravity="center"
-        android:text="OR"
+        android:text="@string/or"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
@@ -79,7 +79,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:textAllCaps="false"
-        android:text="Make Account"
+        android:text="@string/make_account"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +95,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:ems="10"
-        android:hint="CONFIRM PASSWORD"
+        android:hint="@string/confirm_password"
         android:inputType="textPassword"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
@@ -112,7 +112,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:ems="10"
-        android:hint="PASSWORD"
+        android:hint="@string/password"
         android:inputType="textPassword"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
@@ -129,7 +129,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:ems="10"
-        android:hint="E-MAIL ADDRESS"
+        android:hint="@string/e_mail_address"
         android:inputType="textEmailAddress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
@@ -145,7 +145,7 @@
         android:layout_marginTop="72dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:text="Sign Up"
+        android:text="@string/sign_up"
         android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.119"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7a1b8f..c820d97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,15 @@
 <resources>
     <string name="app_name">CosmosClient</string>
+    <string name="or">or</string>
+    <string name="e_mail_address">E-MAIL ADDRESS</string>
+    <string name="password">PASSWORD</string>
+    <string name="confirm_password">CONFIRM PASSWORD</string>
+    <string name="sign_up">Sign Up</string>
+    <string name="already_have_a_account">Already have a account?</string>
+    <string name="login">Login</string>
+    <string name="make_account">Make Account</string>
+    <string name="sign_in">Sign in</string>
+    <string name="don_t_have_an_account">Don\'t have an account?</string>
+    <string name="forgot_password">Forgot Password?</string>
+    <string name="sign_up_now">Sign up Now</string>
 </resources>