diff --git a/app/assets/stylesheets/tokens.sass b/app/assets/stylesheets/tokens.sass
index 5030503c..5f4904a7 100644
--- a/app/assets/stylesheets/tokens.sass
+++ b/app/assets/stylesheets/tokens.sass
@@ -1,12 +1,14 @@
 .token-logo
   max-width: 100%
 
+.table-container
+  background: #39272799
+  width: 100%
 table.token-index
   font-family: "monospace"
   font-size: 1.2rem
   text-shadow: none
   color: #aaaaaa
-  background: #39272740
   .token-logo
     max-width: 4rem
     vertical-align: middle
diff --git a/app/views/tokens/index.html.haml b/app/views/tokens/index.html.haml
index 0751a443..e6167069 100644
--- a/app/views/tokens/index.html.haml
+++ b/app/views/tokens/index.html.haml
@@ -5,7 +5,8 @@
     - if policy(Token).new?
       = link_to 'Add Token', new_token_path
 
-  .table-container
+.table-container
+  .contain
     %table.token-index
       %thead
         %tr
@@ -28,9 +29,9 @@
             %td
               = link_to token do
                 %img.token-logo{src: token.logo_url}
-            %td= token.symbol
+            %td= link_to token.symbol, token
             %td= token.name
-            %td= link_to token.canister_id, token
+            %td= token.canister_id
             %td= token.standard
             %td= token.total_supply
             %td= token.decimals