diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java
index fd3e695..b86e81e 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java
@@ -5,10 +5,13 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
 
 import org.ntlab.radishforandroidstudio.R;
 
@@ -22,12 +25,15 @@
 
     }
 
-    //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓
+
     @Override
     public void onStart() {
         super.onStart();
 
         Button button = (Button)getActivity().findViewById(R.id.signUP1);
+
+
+        //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓
         button.setOnClickListener(new View.OnClickListener() {
 
             @Override
@@ -42,6 +48,27 @@
                 transaction.commit();
             }
         });
+        //↑↑↑↑↑画面遷移↑↑↑↑↑↑
+
+        Button loginButton = (Button)getActivity().findViewById(R.id.login);
+        loginButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                EditText userName = (EditText)getActivity().findViewById(R.id.inputUserName);
+                EditText passWord = (EditText)getActivity().findViewById(R.id.inputPassword);
+
+                CharSequence userNameText = userName.getText();
+                CharSequence passWordText = passWord.getText();
+
+
+                Toast tp = Toast.makeText(getActivity(), passWordText, Toast.LENGTH_SHORT);
+                tp.setGravity(Gravity.TOP, 0, 0);
+                tp.show();
+
+            }
+        });
+
+
 
     }
 }
diff --git a/app/src/main/res/layout/login_fragment.xml b/app/src/main/res/layout/login_fragment.xml
index 582c568..4d93d9a 100644
--- a/app/src/main/res/layout/login_fragment.xml
+++ b/app/src/main/res/layout/login_fragment.xml
@@ -27,14 +27,14 @@
         android:text="Login" />
 
     <EditText
-        android:id="@+id/inputEmailAddress"
+        android:id="@+id/inputUserName"
         android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_below="@+id/EmailAddress"
         android:layout_centerHorizontal="true"
         android:ems="10"
-        android:inputType="textEmailAddress"
-        android:text="Email. address@email.com" />
+        android:inputType="text"
+        android:text="Please enter UserID" />
 
     <EditText
         android:id="@+id/inputPassword"
@@ -51,7 +51,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignStart="@+id/signUP1"
         android:layout_marginTop="41dp"
-        android:text="Email address" />
+        android:text="UserName" />
 
     <TextView
         android:id="@+id/password"
diff --git a/app/src/main/res/layout/sign_up_fragment.xml b/app/src/main/res/layout/sign_up_fragment.xml
index be162a9..17563da 100644
--- a/app/src/main/res/layout/sign_up_fragment.xml
+++ b/app/src/main/res/layout/sign_up_fragment.xml
@@ -20,10 +20,11 @@
 
     <TextView
         android:id="@+id/password"
-        android:layout_width="wrap_content"
+        android:layout_width="150dp"
         android:layout_height="20dp"
-        android:layout_above="@+id/inputPassword"
         android:layout_alignStart="@+id/inputPassword"
+        android:layout_below="@+id/inputPassword"
+        android:layout_marginTop="-107dp"
         android:text="check Password" />
 
     <Button
@@ -35,53 +36,34 @@
         android:text="Sign up" />
 
     <EditText
-        android:id="@+id/inputEmailAddress2"
-        android:layout_width="300dp"
-        android:layout_height="40dp"
-        android:layout_below="@+id/EmailAddress"
-        android:layout_centerHorizontal="true"
-        android:ems="10"
-        android:inputType="textEmailAddress"
-        android:text="Email. address@email.com" />
-
-    <EditText
         android:id="@+id/inputPassword"
         android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="48dp"
+        android:layout_marginBottom="47dp"
         android:ems="10"
         android:inputType="textPassword" />
 
     <TextView
-        android:id="@+id/EmailAddress"
-        android:layout_width="wrap_content"
+        android:id="@+id/password"
+        android:layout_width="100dp"
         android:layout_height="20dp"
         android:layout_alignStart="@+id/inputPassword"
-        android:layout_below="@+id/editText"
-        android:text="Email address" />
-
-    <TextView
-        android:id="@+id/password"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/inputPassword"
-        android:layout_centerVertical="true"
+        android:layout_below="@+id/inputUserName"
         android:text="Password" />
 
     <TextView
         android:id="@+id/userName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="100dp"
+        android:layout_height="20dp"
         android:layout_alignParentTop="true"
         android:layout_alignStart="@+id/inputPassword"
-        android:layout_marginTop="12dp"
-        android:text="userName" />
+        android:text="userID" />
 
     <EditText
         android:id="@+id/editText"
-        android:layout_width="wrap_content"
+        android:layout_width="300dp"
         android:layout_height="40dp"
         android:layout_alignStart="@+id/inputPassword"
         android:layout_below="@+id/userName"
@@ -97,4 +79,22 @@
         android:layout_toEndOf="@+id/inputPassword"
         android:text="Login" />
 
+    <TextView
+        android:id="@+id/UserName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/inputPassword"
+        android:layout_below="@+id/editText"
+        android:text="UserName" />
+
+    <EditText
+        android:id="@+id/inputUserName"
+        android:layout_width="300dp"
+        android:layout_height="40dp"
+        android:layout_below="@+id/UserName"
+        android:layout_centerHorizontal="true"
+        android:ems="10"
+        android:inputType="text|textPersonName"
+        android:text="Please enter Name" />
+
 </RelativeLayout>
\ No newline at end of file