diff --git a/site/themes/citra-bs-theme/layouts/game/list.html b/site/themes/citra-bs-theme/layouts/game/list.html
index 67aed47..f9adbd6 100644
--- a/site/themes/citra-bs-theme/layouts/game/list.html
+++ b/site/themes/citra-bs-theme/layouts/game/list.html
@@ -13,7 +13,7 @@
 		</tbody>
 	</table>
 
-  <table class="table">
+  <table class="table table-responsive">
     <thead>
       <tr>
         <th></th>
@@ -23,11 +23,10 @@
       </tr>
     </thead>
     <tbody>
-      {{ $paginator := .Paginate .Data.Pages 50 }}
-      {{ range $paginator.Pages }}
+      {{ range .Data.Pages }}
         {{ $rating := index .Site.Data.compatibility ( string .Params.compatibility | default "0" ) }}
         <tr>
-          <td><img class="img-responsive" src="{{ .Site.BaseURL }}images/game/icons/{{ default (print .File.BaseFileName ".png") }}" /></td>
+          <td style="width: 55px;"><img class="img-responsive game-icon-list" src="{{ .Site.BaseURL }}images/game/icons/{{ default (print .File.BaseFileName ".png") }}" /></td>
           <td><a href="{{ .Permalink }}">{{ .Params.title }}</a></td>
           <td><div class="square-icon" style="background-color: {{ $rating.color }}"></div> {{ $rating.name }}</td>
           <td>{{ dateFormat "January 2, 2006" .Params.tested_date }}</td>
@@ -35,6 +34,4 @@
       {{ end }}
     </tbody>
   </table>
-
-  {{ partial "pagination" . }}
 {{ end }}
diff --git a/site/themes/citra-bs-theme/layouts/game/single.html b/site/themes/citra-bs-theme/layouts/game/single.html
index c14c524..c1e12a7 100644
--- a/site/themes/citra-bs-theme/layouts/game/single.html
+++ b/site/themes/citra-bs-theme/layouts/game/single.html
@@ -33,7 +33,7 @@
     </div>
     <div class="col-md-7">
       <!-- Metadata information -->
-      <table class="table table-striped table-bordered">
+      <table class="table table-responsive table-striped table-bordered">
         <tbody>
           <tr>
             <td style="width: 100px;">Status</td>
@@ -71,7 +71,7 @@
   <div class="row">
     <div class="col-md-12">
       <h2>Compatibility</h2>
-      <table class="table table-striped">
+      <table class="table table-responsive table-striped">
         <thead>
           <tr>
             <th>Date</th>
@@ -85,7 +85,7 @@
             <td>{{ dateFormat "January 2, 2006" .Params.tested_date }}</td>
             <td><a href="https://community.citra-emu.org/u/{{ .Params.tested_by }}/summary">{{ .Params.tested_by }}</a></td>
             <td>{{ .Params.tested_version }}</td>
-            <td><b>{{ $rating.name }}</b></td>
+            <td><b><div class="square-icon" style="background-color: {{ $rating.color }}"></div> {{ $rating.name }}</b></td>
           </tr>
         </tbody>
       </table>
@@ -96,7 +96,7 @@
     <div class="row">
       <div class="col-md-12">
         <h2>Savefiles</h2>
-        <table class="table table-striped">
+        <table class="table table-responsive table-striped">
           <thead>
             <tr>
               <th>Name</th>
diff --git a/site/themes/citra-bs-theme/static/css/style.css b/site/themes/citra-bs-theme/static/css/style.css
index b1d73ae..fd80c59 100644
--- a/site/themes/citra-bs-theme/static/css/style.css
+++ b/site/themes/citra-bs-theme/static/css/style.css
@@ -320,9 +320,6 @@ a:hover, a:focus {
 
 /* Used for square boxes color coded */
 .square-icon { float: left; margin-top: 2px; margin-right: 4px; width: 16px; height: 16px; background-color: black; }
-.compat-0 { background-color: green; }
-.compat-1 { }
-.compat-2 { }
-.compat-3 { }
-.compat-4 { }
-.compat-5 { }
+
+/* Games Module */
+.game-icon-list { }