diff --git a/.idea/misc.xml b/.idea/misc.xml
index a4db526..3b4f6d8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,14 +5,6 @@
       <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_create_room.xml" value="0.5067708333333333" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_enter_room.xml" value="0.24645390070921985" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_game_master.xml" value="0.3171875" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_game_player_list_fragment.xml" value="0.37395833333333334" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_master_game.xml" value="0.3171875" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_member_game.xml" value="0.4015625" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/fragment_card_drawing.xml" value="0.4015625" />
-        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/fragment_game_player_list.xml" value="0.4015625" />
         <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" />
@@ -21,6 +13,8 @@
         <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/recycler_view_item.xml" value="0.17571611799914494" />
+        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/drawable/border.xml" value="0.275" />
+        <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" />
@@ -30,6 +24,9 @@
         <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>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a2cfbd..4aa667e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,11 +29,11 @@
             android:name=".MainActivity"
             android:exported="true"
             android:screenOrientation="landscape" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
         </activity>
         <activity
             android:name=".EnterRoomActivity"
@@ -58,7 +58,13 @@
         <activity
             android:name=".TestEnterActivity"
             android:exported="true"
-            android:screenOrientation="landscape" />
+            android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".TestDrawingActivity"
             android:exported="true"
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
index 1410ac5..b2c9f43 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
@@ -24,8 +24,6 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_drawing);
 
-        //drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas);
-
         //Irisから必要な情報を取得
         Iris iris = (Iris) this.getApplication();
         String rid = iris.getRid();
@@ -38,7 +36,10 @@
         drawingStateViewModel.setNickName(nickName);
 
         findViewById(R.id.okButtton).setOnClickListener(this);//お絵描き終了ボタン
+        findViewById(R.id.clearButton).setOnClickListener(this);//画面クリアボタン
+
         TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView
+        drawingCanvas = (DrawingCanvas) findViewById(R.id.drawingCanvas);
 
         //getKeywords
         //List<String> keywords = drawingStateViewModel.getKeywords(rid);
diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java b/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
index 9c11905..484798d 100644
--- a/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
+++ b/app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
@@ -23,7 +23,7 @@
         path = new Path();//線を引いたり、図形を描いたり、要するにグラフィック
 
         paint = new Paint();//筆の種類
-        paint.setColor(Color.RED);//色の指定
+        paint.setColor(Color.BLACK);//色の指定
         paint.setStyle(Paint.Style.STROKE);//線をひく
         paint.setStrokeWidth(20);//幅
     }
diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml
new file mode 100644
index 0000000..f7ee6d5
--- /dev/null
+++ b/app/src/main/res/drawable/border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <stroke
+        android:width="1dp"
+        android:color="#3F51B5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index 55763c7..8850c50 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -6,6 +6,18 @@
     android:layout_height="match_parent"
     tools:context=".DrawingActivity">
 
+    <org.ntlab.irisclient.DrawingCanvas
+        android:id="@+id/drawingCanvas"
+        android:layout_width="479dp"
+        android:layout_height="320dp"
+        android:background="@drawable/border"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.94"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.836" />
+
     <Button
         android:id="@+id/okButtton"
         android:layout_width="wrap_content"
@@ -13,35 +25,33 @@
         android:text="OK"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.096"
+        app:layout_constraintHorizontal_bias="0.121"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.9" />
+        app:layout_constraintVertical_bias="0.961" />
 
     <Button
         android:id="@+id/clearButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
         android:text="clear"
         app:layout_constraintBottom_toTopOf="@+id/okButtton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.096"
+        app:layout_constraintHorizontal_bias="0.121"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/testText"
-        app:layout_constraintVertical_bias="0.973" />
+        app:layout_constraintVertical_bias="1.0" />
 
     <TextView
         android:id="@+id/testText"
-        android:layout_width="79dp"
+        android:layout_width="87dp"
         android:layout_height="45dp"
         android:text="test"
         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" />
+        app:layout_constraintVertical_bias="0.052" />
 
     <TextView
         android:id="@+id/textView4"
@@ -66,17 +76,4 @@
         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"
-        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>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file