diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index ce98f32..63e623f 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\student\.android\avd\Nexus_5X_API_29.avd" />
+            <value value="C:\Users\student\.android\avd\Pixel_2_API_30_2.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-10-05T06:19:53.482518700Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-10-05T08:04:09.661881Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7ad4240..539ed66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,42 +9,49 @@
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_gps.xml" value="0.13095238095238096" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.13221884498480244" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.25" />
+        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/filter_layout.xml" value="0.13551165146909827" />
+        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/friend_list_item.xml" value="0.13551165146909827" />
+        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_my_page_activity_posts.xml" value="0.13551165146909827" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.226" />
         <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/drawable/circle_button.xml" value="0.365" />
         <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/drawable/favorite_button.xml" value="0.365" />
-        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_friend.xml" value="0.36666666666666664" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/drawable/ic_star.xml" value="0.2875" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/drawable/ic_star_enabled.xml" value="0.3675" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_friend.xml" value="0.22" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_maps.xml" value="0.253125" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_mypage.xml" value="0.2078125" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_requested.xml" value="0.30570652173913043" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_requesting.xml" value="0.253125" />
         <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop.xml" value="0.36666666666666664" />
         <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop_create.xml" value="0.36666666666666664" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/fragment_friend.xml" value="0.36666666666666664" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/fragment_maps.xml" value="0.30570652173913043" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/friend_list_item.xml" value="0.26856884057971014" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_friend.xml" value="0.365625" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_friend_dialog.xml" value="0.25" />
         <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_friends_activity.xml" value="0.30570652173913043" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2685" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/blue_circle_button.xml" value="0.2685" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_frined_dialog.xml" value="0.36666666666666664" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_requested_activity.xml" value="0.30570652173913043" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_requesting_activity.xml" value="0.253125" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/circle_button.xml" value="0.1545" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_baseline_clear_24.xml" value="0.2685" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_baseline_replay_24.xml" value="0.2685" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_buck.xml" value="0.2685" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_current_location.xml" value="0.1545" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_launcher_background.xml" value="0.2685" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_mypage.xml" value="0.1545" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_set.xml" value="0.1545" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_star.xml" value="0.2685" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_star_outline.xml" value="0.2685" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_change_pw.xml" value="0.22" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_friend.xml" value="0.29891304347826086" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.22314814814814815" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.33" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.228125" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_maps.xml" value="0.17074275362318841" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_my_page_editor.xml" value="0.25" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_mypage.xml" value="0.165" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_my_page_editor.xml" value="0.1625" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_mypage.xml" value="0.22135416666666666" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_post.xml" value="0.33" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_requesting.xml" value="0.33" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop.xml" value="0.3229166666666667" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop_create.xml" value="0.2966485507246377" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_sign_up.xml" value="0.36614583333333334" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_test.xml" value="0.17857142857142858" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_friends_activity.xml" value="0.29891304347826086" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_my_page_activity_posts.xml" value="0.22509057971014493" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_requested_activity.xml" value="0.26766304347826086" />
-        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_requesting_activity.xml" value="0.26766304347826086" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_requesting_activity.xml" value="0.17806484295845998" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_shop_activity_post.xml" value="0.35208333333333336" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_shop_activity_posts.xml" value="0.35208333333333336" />
       </map>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 79e37dc..b7c9dea 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,37 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".LoginActivity">
 
-    <Button
-        android:id="@+id/LoginButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/login"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextNewPassword"
-        app:layout_constraintVertical_bias="0.2" />
-
     <EditText
         android:id="@+id/editTextUserID"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="188dp"
+        android:layout_marginTop="150dp"
         android:autofillHints=""
         android:ems="10"
         android:hint="@string/userid"
         android:inputType="textPersonName"
         android:minHeight="48dp"
         android:textColorHint="#757575"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_gravity="center_horizontal" />
 
     <EditText
         android:id="@+id/editTextTextNewPassword"
@@ -43,38 +30,33 @@
         android:inputType="textPassword"
         android:minHeight="48dp"
         android:textColorHint="#757575"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextUserID" />
-
-    <Button
-        android:id="@+id/SignUp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/signup"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/LoginButton" />
+        android:layout_gravity="center_horizontal" />
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextNewPassword" />
+        android:layout_marginTop="30dp"
+        android:layout_gravity="center_horizontal" />
+
+    <Button
+        android:id="@+id/LoginButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="ログイン"
+        android:layout_gravity="center_horizontal" />
+
+    <Button
+        android:id="@+id/SignUp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="アカウント作成ページへ"
+        android:layout_gravity="center_horizontal" />
 
     <Button
         android:id="@+id/ForgotPW"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/forgot_password"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/SignUp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:text="パスワードを忘れた場合"
+        android:layout_gravity="center_horizontal" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 73a479a..c1915b1 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -1,64 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".SignUpActivity">
 
     <EditText
         android:id="@+id/editTextTextUserName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="204dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="160dp"
         android:autofillHints=""
         android:ems="10"
         android:hint="@string/username"
         android:inputType="textPersonName"
         android:minHeight="48dp"
-        android:textColorHint="#757575"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.502"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textColorHint="#757575" />
 
     <EditText
         android:id="@+id/editTextTextNewPassword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
         android:layout_marginTop="2dp"
         android:autofillHints=""
         android:ems="10"
         android:hint="@string/password"
         android:inputType="textPassword"
         android:minHeight="48dp"
-        android:textColorHint="#757575"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextUserName" />
+        android:textColorHint="#757575" />
 
     <Button
         android:id="@+id/SignUpButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:text="@string/make_a_new_account"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextNewPassword" />
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="5dp"
+        android:text="新規アカウント作成" />
 
     <Button
         android:id="@+id/LoginTrans"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="72dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="50dp"
         android:background="@color/teal_200"
         android:backgroundTint="@color/teal_200"
-        android:text="I have an Account"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/SignUpButton"
+        android:text="ログインページへ"
         app:rippleColor="#3F51B5" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file