diff --git a/.idea/misc.xml b/.idea/misc.xml
index cf9962a..31278b3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,7 @@
       <map>
         <entry key="..\:/Users/Nitta/AndroidStudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.20969202898550723" />
         <entry key="..\:/Users/Nitta/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.266304347826087" />
+        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_game_master.xml" value="0.4239583333333333" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout-land/activity_main.xml" value="0.1574074074074074" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_create_room.xml" value="0.17571611799914494" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_enter_room.xml" value="0.17571611799914494" />
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index ba196e6..1d1fd44 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -80,7 +80,7 @@
         //getKeywordの呼び出し
         drawingStateViewModel.init();
         //タイマースタート呼び出し
-        drawingStateViewModel.start(500);
+        drawingStateViewModel.start(500,iris);
     }
 
     @Override
diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
index b459eb5..6bc6df1 100644
--- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
@@ -11,6 +11,7 @@
 
 public class GamePlayerListFragment extends Fragment {
 
+
     public static GamePlayerListFragment newInstance(String str){
         // インスタンス生成
         GamePlayerListFragment fragment = new GamePlayerListFragment();
@@ -22,7 +23,6 @@
                             Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        Resources resources = getResources();
         View view = inflater.inflate(R.layout.fragment_card_drawing,  container, false);
 
         return view;
diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml
index 1db4629..f533e49 100644
--- a/app/src/main/res/layout/activity_game_master.xml
+++ b/app/src/main/res/layout/activity_game_master.xml
@@ -2,9 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/HintAmount"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".GameMasterActivity">
+    tools:context=".GameMemberActivity">
 
     <Button
         android:id="@+id/finishGuessButton"
@@ -15,6 +16,30 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/timeTextView" />
 
+    <ImageButton
+        android:id="@+id/button21"
+        android:layout_width="46dp"
+        android:layout_height="54dp"
+        android:layout_marginTop="68dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
+        android:id="@+id/button22"
+        android:layout_width="46dp"
+        android:layout_height="54dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button20" />
+
+    <ImageButton
+        android:id="@+id/button20"
+        android:layout_width="46dp"
+        android:layout_height="54dp"
+        android:layout_marginBottom="220dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button21" />
+
     <TextView
         android:id="@+id/timeTextView"
         android:layout_width="131dp"
@@ -45,7 +70,8 @@
         android:layout_marginEnd="9dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
-        android:inputType="textPersonName"
+        android:inputType="text"
+        android:maxLength="10"
         android:text="ヒントを入力"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toStartOf="@+id/GameHintMax"
@@ -62,7 +88,9 @@
         android:layout_marginEnd="264dp"
         android:layout_marginBottom="23dp"
         android:ems="10"
-        android:inputType="textPersonName"
+        android:inputType="number"
+        android:digits="0123456789"
+        android:maxLength="1"
         android:text="数"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toEndOf="parent"
@@ -84,33 +112,5 @@
         app:layout_constraintStart_toEndOf="@+id/GameHintMax"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/RedPlayerListContainer"
-        layout="@layout/fragment_game_player_list"
-        android:layout_width="90dp"
-        android:layout_height="275dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="89dp"
-        android:layout_marginEnd="14dp"
-        android:layout_marginBottom="47dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/container"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/BluePlayerListContainer"
-        layout="@layout/fragment_game_player_list"
-        android:layout_width="90dp"
-        android:layout_height="275dp"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="89dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="9dp"
-        app:layout_constraintBottom_toTopOf="@+id/finishGuessButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/container"
-        app:layout_constraintTop_toTopOf="parent" />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file