diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java
index d32f433..a2f9074 100644
--- a/app/src/main/java/com/example/nemophila/MyPageActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java
@@ -19,12 +19,12 @@
 import com.example.nemophila.viewmodels.AccountViewModel;
 
 public class MyPageActivity extends AppCompatActivity {
-
+//MyPageActivity画面の作成
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_mypage);
-
+//ボタンを押した場合の画面遷移
         Button friendButton = (Button) findViewById(R.id.friend);
         friendButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
@@ -56,12 +56,13 @@
                 startActivity(intent);
             }
         });
-
+//AccountViewModelとの通信とテキストの表示
         AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
-        TextView name = (TextView) findViewById(R.id.name);
-        TextView id = (TextView) findViewById(R.id.id);
-//        accountViewModel.getAccountLiveData().observe(this, new Observer<Account>() {
-//
-//        });
+        Nemophila nemophila = (Nemophila) getApplication();
+        String uid = nemophila.getUid();
+//        String name  = nemophila.
+//        TextView name = (TextView) findViewById(R.id.name);
+//        TextView id = (TextView) findViewById(R.id.id);
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
index 0a0018b..b9b46be 100644
--- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
@@ -19,7 +19,7 @@
         setContentView(R.layout.activity_my_page_editor);
 //AccountViewModelとの通信
         AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
-//
+//MyPageに戻るボタン
         Button backButton = (Button) findViewById(R.id.backMyPage);
         backButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
@@ -28,15 +28,18 @@
 
             }
         });
+//変更確定ボタンを押した場合の動き
         Button changeNameButton = (Button) findViewById(R.id.changeConfirm);
         changeNameButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
+//名前とパスワードを取り込む
                 EditText editName = (EditText) findViewById(R.id.editName);
                 String newName = editName.getText().toString();
                 EditText editOldPw = (EditText) findViewById(R.id.editOldPw);
                 String oldPw = editOldPw.getText().toString();
                 EditText editNewPw = (EditText) findViewById(R.id.editNewPw);
                 String newPw = editNewPw.getText().toString();
+//Nemophilaから(id)(token)をgetしてaccountViewModelに送る
                 Nemophila nemophila = (Nemophila) getApplication();
                 String uid = nemophila.getUid();
                 String token  = nemophila.getToken();
@@ -46,6 +49,9 @@
                 if(oldPw!=null && newPw!=null) {
                     accountViewModel.changePw(uid, oldPw, newPw, token);
                 }
+//変更確定ボタンを押した場合もMyPageに戻る
+                Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class);
+                startActivity(intent);
             }
         });
     }
diff --git a/app/src/main/res/layout/activity_my_page_editor.xml b/app/src/main/res/layout/activity_my_page_editor.xml
index 51d28a7..f8439a4 100644
--- a/app/src/main/res/layout/activity_my_page_editor.xml
+++ b/app/src/main/res/layout/activity_my_page_editor.xml
@@ -29,7 +29,7 @@
         android:layout_marginEnd="16dp"
         android:ems="10"
         android:inputType="textPersonName"
-        android:text="前のパスワードを入力してください"
+        android:text="前のパスワード"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +46,7 @@
         android:layout_marginEnd="16dp"
         android:ems="10"
         android:inputType="textPersonName"
-        android:text="新しいパスワードを入力してください"
+        android:text="新しいパスワード"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"