diff --git a/.idea/misc.xml b/.idea/misc.xml
index af953e4..b6c8909 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,31 +7,27 @@
         <entry key="..\:/Users/Nitta/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.266304347826087" />
         <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_drawing.xml" value="0.13825929283771532" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_enter_room.xml" value="0.17571611799914494" />
+        <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_game.xml" value="0.13825929283771532" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.1859375" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_member_room.xml" value="0.25" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_owner_room.xml" value="0.17571611799914494" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/fragment_first.xml" value="0.15433946130825138" />
+        <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/member_list_layout.xml" value="0.1" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/recycler_view_item.xml" value="0.17571611799914494" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/drawable/frame_style.xml" value="0.285" />
         <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout-land/activity_main.xml" value="0.31040564373897706" />
         <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout-sw600dp/activity_main.xml" value="0.2189207650273224" />
         <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_create_room.xml" value="0.29030797101449274" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_drawing.xml" value="0.36614583333333334" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_enter_room.xml" value="0.2791666666666667" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_game.xml" value="0.36614583333333334" />
+        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_drawing.xml" value="0.33" />
+        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_game.xml" value="0.19375" />
         <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.29030797101449274" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_member_room.xml" value="0.36614583333333334" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_owner_room.xml" value="0.36614583333333334" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/fragment_card_drawing.xml" value="0.4981481481481482" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/frame_style.xml" value="0.2796875" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/recycler_view_item.xml" value="0.28072916666666664" />
         <entry key="..\:/Users/totos/StudioProjects/IrisClient/app/src/main/res/layout/activity_drawing.xml" value="0.25" />
         <entry key="..\:/Users/totos/StudioProjects/IrisClient/app/src/main/res/layout/activity_member_room.xml" value="0.33" />
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index fc9b7c3..3b74aca 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -16,20 +16,21 @@
 public class DrawingActivity extends AppCompatActivity implements View.OnClickListener {
 
     private DrawingCanvas drawingCanvas;
-    DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class);
+    private DrawingStateViewModel drawingStateViewModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_drawing);
 
-        drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas);
+        //drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas);
 
         //Irisから必要な情報を取得
         Iris iris = (Iris) this.getApplication();
         String rid = iris.getRid();
         String nickName = iris.getNickname();
 
+        drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class);
         //viewModelに必用な情報をセット
         drawingStateViewModel.setRid(rid);
         drawingStateViewModel.setNickName(nickName);
@@ -38,14 +39,14 @@
         TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView
 
         //getKeywords
-        List<String> keywords = drawingStateViewModel.getKeywords(rid);
+        //List<String> keywords = drawingStateViewModel.getKeywords(rid);
 
         //getDno
         drawingStateViewModel.getDno().observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer dno) {
-                String keyword = keywords.get(dno);
-                textKeyword.setText(keyword);
+                //String keyword = keywords.get(dno);
+                //textKeyword.setText(keyword);
             }
         });
 
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index db68bde..55763c7 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -8,50 +8,74 @@
 
     <Button
         android:id="@+id/okButtton"
-        android:layout_width="87dp"
-        android:layout_height="48dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="OK"
-        tools:layout_editor_absoluteX="64dp"
-        tools:layout_editor_absoluteY="347dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.096"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.9" />
 
     <Button
         android:id="@+id/clearButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
         android:text="clear"
-        tools:layout_editor_absoluteX="62dp"
-        tools:layout_editor_absoluteY="280dp" />
+        app:layout_constraintBottom_toTopOf="@+id/okButtton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.096"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/testText"
+        app:layout_constraintVertical_bias="0.973" />
 
     <TextView
         android:id="@+id/testText"
         android:layout_width="79dp"
         android:layout_height="45dp"
         android:text="test"
-        tools:layout_editor_absoluteX="72dp"
-        tools:layout_editor_absoluteY="16dp" />
+        app:layout_constraintBottom_toTopOf="@+id/okButtton"
+        app:layout_constraintEnd_toStartOf="@+id/textKeyword"
+        app:layout_constraintHorizontal_bias="0.393"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.078" />
 
     <TextView
         android:id="@+id/textView4"
         android:layout_width="95dp"
         android:layout_height="51dp"
+        android:layout_marginEnd="16dp"
         android:text="time"
-        tools:layout_editor_absoluteX="620dp"
-        tools:layout_editor_absoluteY="16dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.041" />
 
     <TextView
         android:id="@+id/textKeyword"
         android:layout_width="375dp"
         android:layout_height="50dp"
+        android:layout_marginStart="228dp"
         android:text="keyword"
-        tools:layout_editor_absoluteX="234dp"
-        tools:layout_editor_absoluteY="16dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/textView4"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.044" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/canvas"
         android:layout_width="482dp"
         android:layout_height="312dp"
-        tools:layout_editor_absoluteX="234dp"
-        tools:layout_editor_absoluteY="79dp">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.939"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.838">
 
     </androidx.constraintlayout.widget.ConstraintLayout>