diff --git a/app/src/main/java/com/example/cosmosclient/views/Cheeses.java b/app/src/main/java/com/example/cosmosclient/views/Cheeses.java
index d57f508..a1386ac 100644
--- a/app/src/main/java/com/example/cosmosclient/views/Cheeses.java
+++ b/app/src/main/java/com/example/cosmosclient/views/Cheeses.java
@@ -8,6 +8,6 @@
             "Group4\n  ほげほげ\n  ほげほげ",
             "Group5\n  ほげほげ\n  ほげほげ\n  ほげほげ\n  ほげほげ",
             "Group6\n  ほげほげ\n  ほげほげ\n  ほげほげ",
-            "Group7\n  ほげほげ\n  ほげほげ"
+            "Group7"
     };
 }
diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
index 1c51c9c..22b50ec 100644
--- a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
@@ -85,6 +85,7 @@
         group1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                gridView.stopEditMode();
                 Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.RequestListActivity.class);
                 startActivity(intent);
             }
@@ -141,12 +142,15 @@
         // Handle navigation view item clicks here.
         int id = item.getItemId();
         if ( id == R.id.createNewGroupButton){
+            gridView.stopEditMode();
             Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.CreateGroupActivity.class);
             startActivity(intent);
         } else if (id == R.id.joinGroupButton){
+            gridView.stopEditMode();
             Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.JoinGroupActionsActivity.class);
             startActivity(intent);
         } else if (id == R.id.signOutButton){
+            gridView.stopEditMode();
             Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.SigninActivity.class);
             startActivity(intent);
         }
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index e3df2b7..a165241 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -23,10 +23,18 @@
         android:padding="15dp"
         android:gravity="left"
         />
+<<<<<<< Updated upstream
 
     <ListView
         android:id="@id/listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+=======
+    <ListView
+        android:id="@id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+>>>>>>> Stashed changes
 </LinearLayout>
\ No newline at end of file