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 4fe2370..5cd0d4e 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 
 import com.example.cosmosclient.R;
 
@@ -15,17 +16,24 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_signin);
 
-//        Button SigninButton = findViewById(R.id.SigninButton);
-//        SigninButton.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                Intent intent = new Intent(getApplication(), GroupsListActivity.class);
-//                startActivity(intent);
-//                finish();
-//            }
-//        });
+        //各種IDを取得
+        Button SigninButton = findViewById(R.id.SigninButton);
+        Button SignupButton = findViewById(R.id.SignupButton);
+        EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+        EditText PasswordText = findViewById(R.id.PasswordText);
+        Button ForgotPasswordButton = findViewById(R.id.ForgotPasswordButton);
 
-        Button  SignupButton = findViewById(R.id.SignupButton);
+        //Sign inボタンの処理
+        SigninButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getApplication(), SignupActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        });
+
+        //サインアップ画面への遷移処理
         SignupButton.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v){
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 42755f0..56ac44b 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 
 import com.example.cosmosclient.R;
 
@@ -15,17 +16,24 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_signup);
 
-//        Button MakeAccountButton = findViewById(R.id.MakeAccountButton);
-//        MakeAccountButton.setOnClickListener(new View.OnClickListener(){
-//            @Override
-//            public void onClick(View v){
-//                Intent intent = new Intent(getApplication(), GroupsListActivity.class);
-//                startActivity(intent);
-//                finish();
-//            }
-//        });
-
+        //各種idを取得
         Button LoginButton = findViewById(R.id.LoginButton);
+        Button MakeAccountButton = findViewById(R.id.MakeAccountButton);
+        EditText EmailAddressText = findViewById(R.id.EMailAddressText);
+        EditText PasswordText = findViewById(R.id.PasswordText);
+        EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText);
+
+        //Make Accountボタンの処理
+        MakeAccountButton.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v){
+                Intent intent = new Intent(getApplication(), SigninActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        });
+
+        //サインイン画面への遷移処理
         LoginButton.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v){
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index 29765c7..b9ee79c 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -12,18 +12,18 @@
         android:layout_height="66dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="28dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:textAllCaps="false"
         android:text="Sign in"
+        android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText5" />
+        app:layout_constraintTop_toBottomOf="@+id/PasswordText" />
 
     <EditText
-        android:id="@+id/editText5"
+        android:id="@+id/PasswordText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"
@@ -32,16 +32,16 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:ems="10"
-        android:hint="password"
+        android:hint="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/editText4"
+        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText"
         android:autofillHints="" />
 
     <EditText
-        android:id="@+id/editText4"
+        android:id="@+id/EMailAddressText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"
@@ -98,7 +98,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="64dp"
         android:layout_marginRight="64dp"
-        android:background="@drawable/borderless_button"
+        android:background="#00000000"
         android:textAllCaps="false"
         android:text="Sign Up Now"
         android:textColor="#3F51B5"
@@ -132,12 +132,26 @@
         android:text="OR"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.467"
+        app:layout_constraintHorizontal_bias="0.489"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/SigninButton" />
 
-
-
+    <Button
+        android:id="@+id/ForgotPasswordButton"
+        style="@android:style/Widget.DeviceDefault.Button.Borderless"
+        android:layout_width="115dp"
+        android:layout_height="18dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="4dp"
+        android:background="#00000000"
+        android:gravity="left"
+        android:text="Forgot Password?"
+        android:textAllCaps="false"
+        android:textColor="#3F51B5"
+        android:textSize="14sp"
+        app:layout_constraintStart_toStartOf="@+id/PasswordText"
+        app:layout_constraintTop_toBottomOf="@+id/PasswordText" />
 
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 7c4b42e..7d692a2 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -29,7 +29,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="116dp"
         android:layout_marginRight="116dp"
-        android:background="@drawable/borderless_button"
+        android:background="#00000000"
         android:textAllCaps="false"
         android:text="Login"
         android:textColor="#3F51B5"
@@ -42,7 +42,7 @@
         android:layout_height="1dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="50dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="32dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="50dp"
         android:background="@android:color/darker_gray"
@@ -53,11 +53,11 @@
 
     <TextView
         android:id="@+id/textView5"
-        android:layout_width="40dp"
-        android:layout_height="25dp"
+        android:layout_width="37dp"
+        android:layout_height="28dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="20dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:background="#FFFFFF"
@@ -65,6 +65,7 @@
         android:text="OR"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/MakeAccountButton" />
 
@@ -82,10 +83,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText7" />
+        app:layout_constraintTop_toBottomOf="@+id/ConfirmPasswordText" />
 
     <EditText
-        android:id="@+id/editText7"
+        android:id="@+id/ConfirmPasswordText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"
@@ -99,10 +100,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText5" />
+        app:layout_constraintTop_toBottomOf="@+id/PasswordText" />
 
     <EditText
-        android:id="@+id/editText5"
+        android:id="@+id/PasswordText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"
@@ -116,10 +117,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.445"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText4" />
+        app:layout_constraintTop_toBottomOf="@+id/EMailAddressText" />
 
     <EditText
-        android:id="@+id/editText4"
+        android:id="@+id/EMailAddressText"
         android:layout_width="294dp"
         android:layout_height="41dp"
         android:layout_marginStart="8dp"