diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
index 0892581..374ef0c 100644
--- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
@@ -10,6 +10,7 @@
 import android.widget.EditText;
 import android.widget.ImageButton;
 
+
 public class EnterRoomActivity extends AppCompatActivity {
 
     @Override
@@ -31,19 +32,21 @@
         });
 
         Button nextButton = findViewById(R.id.EntryRoomButton);
-        EditText text0 = (EditText) findViewById(R.id.nicknameEditText);
-        EditText text1 = (EditText) findViewById(R.id.roomidEditText);
         nextButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
+                EditText nicknameForm = findViewById(R.id.nicknameEditText);
+                EditText roomIdForm = findViewById(R.id.roomIdEditText);
+
+                String name = nicknameForm.getText().toString();
+                String rid = roomIdForm.getText().toString();
 
                 //ニックネームが入力されていない場合エラーメッセージを表示する
-                if (text0.getText().toString().isEmpty() || text1.getText().toString().isEmpty()) {
-                    text0.setError("ニックネームを入力されていません");
-                    text1.setError("部屋番号を入力されていません");
-
+                if (name.isEmpty() || rid.isEmpty()) {
+                    nicknameForm.setError("ニックネームを入力されていません");
+                    roomIdForm.setError("部屋番号を入力されていません");
                     //ニックネームが入力されていれば次の画面へ
                 } else {
-                    Intent intent = new Intent(EnterRoomActivity.this,OwnerRoomActivity.class);
+                    Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class);
                     startActivity(intent);
                 }
             }
diff --git a/app/src/main/java/org/ntlab/irisclient/MainActivity.java b/app/src/main/java/org/ntlab/irisclient/MainActivity.java
index fd1080f..0bb3ca4 100644
--- a/app/src/main/java/org/ntlab/irisclient/MainActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/MainActivity.java
@@ -20,6 +20,14 @@
             actionBar.hide();
         }
 
+        Button createButton =(Button)findViewById(R.id.create_room);
+        createButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v){
+                Intent intent = new Intent(MainActivity.this,CreateRoomActivity.class);
+                startActivity(intent);
+            }
+        });
+
         Button entryButton =(Button)findViewById(R.id.entry_room);
         entryButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v){
diff --git a/app/src/main/res/layout/activity_enter_room.xml b/app/src/main/res/layout/activity_enter_room.xml
index 2256c75..7b8ed06 100644
--- a/app/src/main/res/layout/activity_enter_room.xml
+++ b/app/src/main/res/layout/activity_enter_room.xml
@@ -47,7 +47,7 @@
         app:layout_constraintVertical_bias="0.084" />
 
     <TextView
-        android:id="@+id/roomidTextView"
+        android:id="@+id/roomIdTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="部屋番号を入力してください"
@@ -59,7 +59,7 @@
         app:layout_constraintVertical_bias="0.461" />
 
     <EditText
-        android:id="@+id/roomidEditText"
+        android:id="@+id/roomIdEditText"
         android:layout_width="279dp"
         android:layout_height="54dp"
         android:ems="10"
@@ -71,7 +71,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomidTextView"
+        app:layout_constraintTop_toBottomOf="@+id/roomIdTextView"
         app:layout_constraintVertical_bias="0.172" />
 
     <ImageButton