diff --git a/packages/play-node-go/public/reset.css b/packages/play-node-go/public/reset.css
index 82c1626..e91c47f 100644
--- a/packages/play-node-go/public/reset.css
+++ b/packages/play-node-go/public/reset.css
@@ -1,5 +1,6 @@
-a {
+a, a:link, a:visited, a:focus, a:active {
   color: unset;
+  text-decoration: none;
 }
 
 /* http://meyerweb.com/eric/tools/css/reset/
diff --git a/packages/play-node-go/public/stylesheets/partials/_mixins.scss b/packages/play-node-go/public/stylesheets/partials/_mixins.scss
index 5f00e47..94c2991 100644
--- a/packages/play-node-go/public/stylesheets/partials/_mixins.scss
+++ b/packages/play-node-go/public/stylesheets/partials/_mixins.scss
@@ -14,4 +14,8 @@
   color: rgb(255,240,230);
   background-color: rgba(0,0,0,0.7);
   padding: 0.25em;
+}
+
+@function place-below($grid-column, $grid-row) {
+  @return $grid-row + 1 + '/' + $grid-column + 2 + '/ span 1 / span 1';
 }
\ No newline at end of file
diff --git a/packages/play-node-go/public/stylesheets/style.css b/packages/play-node-go/public/stylesheets/style.css
deleted file mode 100644
index 9453385..0000000
--- a/packages/play-node-go/public/stylesheets/style.css
+++ /dev/null
@@ -1,8 +0,0 @@
-body {
-  padding: 50px;
-  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-}
-
-a {
-  color: #00B7FF;
-}
diff --git a/packages/play-node-go/src/components/Button/Game/Game.scss b/packages/play-node-go/src/components/Button/Game/Game.scss
index 5fe29e8..925b6f2 100644
--- a/packages/play-node-go/src/components/Button/Game/Game.scss
+++ b/packages/play-node-go/src/components/Button/Game/Game.scss
@@ -129,11 +129,7 @@ div.GameButton__player-data {
   }
 }
 
-.GameButton__link {
+a.GameButton__link {
   @include gameViewLabel;
   margin: 0 auto;
-  text-decoration: none;
-  &:hover {
-    text-decoration: underline;
-  }
 }
\ No newline at end of file
diff --git a/packages/play-node-go/src/components/Display/RoomDetail/RoomDetail.scss b/packages/play-node-go/src/components/Display/RoomDetail/RoomDetail.scss
index e69de29..56d3ee4 100644
--- a/packages/play-node-go/src/components/Display/RoomDetail/RoomDetail.scss
+++ b/packages/play-node-go/src/components/Display/RoomDetail/RoomDetail.scss
@@ -0,0 +1 @@
+@import '../../../../public/stylesheets/partials/mixins';
diff --git a/packages/play-node-go/src/index.scss b/packages/play-node-go/src/index.scss
index 4d5308a..566ccfd 100644
--- a/packages/play-node-go/src/index.scss
+++ b/packages/play-node-go/src/index.scss
@@ -45,3 +45,7 @@ code {
   font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
     monospace;
 }
+
+a:hover, a:active {
+  text-decoration: underline;
+}
\ No newline at end of file
diff --git a/packages/play-node-go/src/pages/Home/Home.js b/packages/play-node-go/src/pages/Home/Home.js
index 7d7a804..1ef7225 100644
--- a/packages/play-node-go/src/pages/Home/Home.js
+++ b/packages/play-node-go/src/pages/Home/Home.js
@@ -10,7 +10,7 @@ const Home = props => {
   const dispatch =  props.dispatch;
   const [ roomDetail, setRoomDetail ] = useState(0);
 
-  const showRoomDetail = id => setRoomDetail(id);
+  const showRoomDetail = id => roomDetail === id ? setRoomDetail(0) : setRoomDetail(id);
   
   const renderRooms = () => {
     const rooms = state.rooms || [];
diff --git a/packages/play-node-go/src/pages/Home/Home.scss b/packages/play-node-go/src/pages/Home/Home.scss
index ec08757..25abc20 100644
--- a/packages/play-node-go/src/pages/Home/Home.scss
+++ b/packages/play-node-go/src/pages/Home/Home.scss
@@ -3,10 +3,9 @@
 
 div.Home {
   @include fullspan;
-  display: flex;
-  flex-flow: row wrap;
-  align-items: flex-start;
-  justify-content: flex-start;
   background-color: map-get($colors, "home");
+  display: grid;
+  grid-template-columns: repeat(auto-fill, 22vh);
+  grid-template-rows: repeat(auto-fill, minmax(22vh, 1fr));
   overflow: scroll;
 }
\ No newline at end of file