diff --git a/apps/explorer_web/assets/css/_code.scss b/apps/explorer_web/assets/css/_code.scss
index 223c586d5d..c1678f45b9 100644
--- a/apps/explorer_web/assets/css/_code.scss
+++ b/apps/explorer_web/assets/css/_code.scss
@@ -5,3 +5,7 @@
     word-break: break-all;
   }
 }
+
+.pre-scrollable-shorty {
+  max-height: $pre-scrollable-max-height / 7;
+}
diff --git a/apps/explorer_web/assets/css/_typography.scss b/apps/explorer_web/assets/css/_typography.scss
index f7ff1c3f04..076cc378bd 100644
--- a/apps/explorer_web/assets/css/_typography.scss
+++ b/apps/explorer_web/assets/css/_typography.scss
@@ -41,12 +41,12 @@ p {
 
 a {
   text-decoration: none;
-  color: $gray-800;
-  font-size: 12px;
+  color: $primary;
+  font-size: 13px;
 
   &:hover,
   &:focus {
-    text-decoration: none;
+    text-decoration: underline;
   }
 }
 .monospace {
diff --git a/apps/explorer_web/assets/css/components/_header.scss b/apps/explorer_web/assets/css/components/_header.scss
index c89f5f1a18..b9aa40a64c 100644
--- a/apps/explorer_web/assets/css/components/_header.scss
+++ b/apps/explorer_web/assets/css/components/_header.scss
@@ -115,3 +115,8 @@ input::-webkit-input-placeholder {
 .topnav-dropdown-items {
   padding-left: 12px;
 }
+
+.topnav-nav-link {
+  margin-top: 3px;
+  color: $gray-800;
+}
diff --git a/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex b/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex
index 4a61846923..0558fe543b 100644
--- a/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex
+++ b/apps/explorer_web/lib/explorer_web/controllers/transaction_controller.ex
@@ -28,7 +28,9 @@ defmodule ExplorerWeb.TransactionController do
       Keyword.merge(
         [
           necessity_by_association: %{
-            block: :required
+            block: :required,
+            from_address: :optional,
+            to_address: :optional
           },
           paging_options: @default_paging_options
         ],
diff --git a/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex b/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex
index 96a579f41a..1b71828c36 100644
--- a/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/address/_link.html.eex
@@ -1,14 +1,18 @@
 <div class="address-link">
-<%= if @address_hash do %>
-  <%= link to: address_path(@conn, :show, @conn.assigns.locale, @address_hash),
-      "data-toggle": "tooltip",
-      "data-placement": "top",
-      class: "address-link__font",
-      title: @address_hash do %>
+  <%= if @address do %>
+    <%= link to: address_path(@conn, :show, @conn.assigns.locale, @address),
+    "data-toggle": "tooltip",
+    "data-placement": "top",
+    class: "address-link__font",
+    title: @address do %>
+      <%= if contract?(@address) do %>
+        <i class="address-link__type fas fa-file"></i>
+      <% else %>
         <i class="address-link__type fas fa-address-card"></i>
-    <%= @address_hash |> hash() |> String.slice(0..3) %><i class="fas fa-ellipsis-v address-link__seperator"></i><%= @address_hash |> hash() |> String.slice(-4..-1) %>
+      <% end %>
+    <%= @address |> hash() |> String.slice(0..3) %><i class="fas fa-ellipsis-v address-link__seperator"></i><%= @address |> hash() |> String.slice(-4..-1) %>
 <% end %>
-<button class="address-link__copy-button" data-clipboard-text="<%= @address_hash %>" aria-label="copy address">
+<button class="address-link__copy-button" data-clipboard-text="<%= @address %>" aria-label="copy address">
   <i class="fa fa-copy"></i>
 </button>
 <% end %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex
index 41c16e7d0a..af48cf81a1 100644
--- a/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/address_internal_transaction/index.html.eex
@@ -96,10 +96,10 @@
                   </td>
                   <td><%= ExplorerWeb.BlockView.age(internal_transaction.transaction.block) %></td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.from_address_hash %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.from_address %>
                   </td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.to_address_hash %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.to_address %>
                   </td>
                   <td><%= ExplorerWeb.TransactionView.value(internal_transaction, include_label: false) %></td>
                 </tr>
diff --git a/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex
index a5e510bd5f..8169efebf8 100644
--- a/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/address_transaction/index.html.eex
@@ -103,11 +103,11 @@
                 </td>
                 <td><%= transaction.block.timestamp |> Timex.from_now %></td>
                 <td class="address-cell">
-                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
+                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
                 </td>
                 <td class="u-text-center"><i class="fas fa-arrow-circle-right"></i></td>
                 <td>
-                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
+                  <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
                 </td>
                 <td><%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %></td>
                 <td><%= ExplorerWeb.TransactionView.formatted_fee(transaction, denomination: :ether) %></td>
diff --git a/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex
index 5a8b6e1e54..b0cefd869e 100644
--- a/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/block_transaction/index.html.eex
@@ -164,11 +164,11 @@
                     <%= transaction.block.timestamp |> Timex.from_now %>
                   </td>
                   <td class="address-cell">
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
                   </td>
                   <td class="u-text-center"><i class="fas fa-arrow-circle-right"></i></td>
                   <td>
-                      <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
+                      <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
                   </td>
                   <td>
                     <%= ExplorerWeb.TransactionView.value(transaction) %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex b/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex
index 4e132eef91..4963d97113 100644
--- a/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/chain/_blocks.html.eex
@@ -21,7 +21,7 @@
           <td><%= block.transactions |> Enum.count %></td>
           <td><%= block.gas_used |> Cldr.Number.to_string! %></td>
           <td>
-            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: block.miner_hash %>
+            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: block.miner %>
           </td>
         </tr>
         <% end %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex b/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex
index 09423bf7d1..ed4d1bff71 100644
--- a/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex
@@ -17,10 +17,10 @@
             <%= render ExplorerWeb.TransactionView, "_link.html", conn: @conn, transaction: transaction %>
           </td>
           <td>
-            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
+            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
           </td>
           <td>
-            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
+            <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
           </td>
           <td><%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> </td>
           <td><%= transaction.block.timestamp |> Timex.from_now() %></td>
diff --git a/apps/explorer_web/lib/explorer_web/templates/layout/_topnav.html.eex b/apps/explorer_web/lib/explorer_web/templates/layout/_topnav.html.eex
index 1a4cfabe28..be4fc7b416 100644
--- a/apps/explorer_web/lib/explorer_web/templates/layout/_topnav.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/layout/_topnav.html.eex
@@ -16,13 +16,13 @@
         <% end %>
       </li>
       <li calss="nav-item">
-        <%= link to: block_path(@conn, :index, Gettext.get_locale), class: "nav-link" do %>
+        <%= link to: block_path(@conn, :index, Gettext.get_locale), class: "nav-link topnav-nav-link" do %>
           <img src="<%= static_path(@conn, "/images/block.svg") %>" />
           <%= gettext("Blocks") %>
         <% end %>
       </li>
       <li calss="nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a class="topnav-nav-link nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <img src="<%= static_path(@conn, "/images/transaction.svg") %>" />
           <%= gettext("Transactions") %>
         </a>
diff --git a/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex
index 59feb1cebe..9e0d610ef9 100644
--- a/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex
@@ -50,10 +50,10 @@
               </td>
               <td><%= last_seen(transaction) %></td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
               </td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
               </td>
               <td>
               <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex
index aea640d2c7..e2ad7de778 100644
--- a/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex
@@ -59,10 +59,10 @@
                 <%= transaction.block.timestamp %>
               </td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.from_address_hash %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.from_address %>
               </td>
               <td>
-                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: transaction.to_address_hash %>
+                <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: transaction.to_address %>
               </td>
               <td>
                 <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex
index 9cbf7b761c..0bcf3374e3 100644
--- a/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/transaction/overview.html.eex
@@ -180,7 +180,7 @@
                 <td title="<%= @transaction.input %>">
                   <div class="card bg-light">
                     <div class="card-body">
-                      <pre class="pre-scrollable pre-wrap mb-0">
+                      <pre class="pre-scrollable pre-scrollable-shorty pre-wrap mb-0">
                         <code>
                           <%= @transaction.input %>
                         </code>
diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex
index ad71b65430..a011aa9b84 100644
--- a/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex
+++ b/apps/explorer_web/lib/explorer_web/templates/transaction_internal_transaction/index.html.eex
@@ -38,10 +38,10 @@
                 <tr>
                   <td><%= internal_transaction.call_type %></td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.from_address_hash %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.from_address %>
                   </td>
                   <td>
-                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address_hash: internal_transaction.to_address_hash %>
+                    <%= render ExplorerWeb.AddressView, "_link.html", conn: @conn, address: internal_transaction.to_address %>
                   </td>
                   <td><%= ExplorerWeb.TransactionView.value(internal_transaction, include_label: false) %></td>
                   <td><%= ExplorerWeb.TransactionView.gas(internal_transaction) %></td>
diff --git a/apps/explorer_web/lib/explorer_web/views/address_view.ex b/apps/explorer_web/lib/explorer_web/views/address_view.ex
index 2c75f3a403..fe130f9c29 100644
--- a/apps/explorer_web/lib/explorer_web/views/address_view.ex
+++ b/apps/explorer_web/lib/explorer_web/views/address_view.ex
@@ -2,7 +2,6 @@ defmodule ExplorerWeb.AddressView do
   use ExplorerWeb, :view
 
   alias Explorer.Chain.{Address, Wei}
-  alias Explorer.Chain.Hash
   alias Explorer.ExchangeRates.Token
   alias ExplorerWeb.ExchangeRates.USD
 
@@ -42,7 +41,7 @@ defmodule ExplorerWeb.AddressView do
     end
   end
 
-  def hash(%Hash{} = hash) do
+  def hash(%Address{hash: hash}) do
     to_string(hash)
   end
 
diff --git a/apps/explorer_web/priv/gettext/default.pot b/apps/explorer_web/priv/gettext/default.pot
index a3cbcd24b0..929c3cbbf6 100644
--- a/apps/explorer_web/priv/gettext/default.pot
+++ b/apps/explorer_web/priv/gettext/default.pot
@@ -155,7 +155,7 @@ msgstr ""
 
 #: lib/explorer_web/templates/address/overview.html.eex:11
 #: lib/explorer_web/templates/transaction_log/index.html.eex:29
-#: lib/explorer_web/views/address_view.ex:18
+#: lib/explorer_web/views/address_view.ex:17
 msgid "Address"
 msgstr ""
 
@@ -496,7 +496,7 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
-#: lib/explorer_web/views/address_view.ex:16
+#: lib/explorer_web/views/address_view.ex:15
 msgid "Contract Address"
 msgstr ""
 
diff --git a/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po
index c664eec8e8..8bd03ccaad 100644
--- a/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -167,7 +167,7 @@ msgstr "%{count} transactions in this block"
 
 #: lib/explorer_web/templates/address/overview.html.eex:11
 #: lib/explorer_web/templates/transaction_log/index.html.eex:29
-#: lib/explorer_web/views/address_view.ex:18
+#: lib/explorer_web/views/address_view.ex:17
 msgid "Address"
 msgstr "Address"
 
@@ -508,7 +508,7 @@ msgstr ""
 msgid "Contract"
 msgstr ""
 
-#: lib/explorer_web/views/address_view.ex:16
+#: lib/explorer_web/views/address_view.ex:15
 msgid "Contract Address"
 msgstr ""
 
diff --git a/apps/explorer_web/test/explorer_web/views/address_view_test.exs b/apps/explorer_web/test/explorer_web/views/address_view_test.exs
index 2372f56eb5..a196c5e875 100644
--- a/apps/explorer_web/test/explorer_web/views/address_view_test.exs
+++ b/apps/explorer_web/test/explorer_web/views/address_view_test.exs
@@ -1,9 +1,23 @@
 defmodule ExplorerWeb.AddressViewTest do
   use ExplorerWeb.ConnCase, async: true
 
+  alias Explorer.Chain.Data
   alias ExplorerWeb.AddressView
   alias Explorer.ExchangeRates.Token
 
+  describe "contract?/1" do
+    test "with a smart contract" do
+      {:ok, code} = Data.cast("0x000000000000000000000000862d67cb0773ee3f8ce7ea89b328ffea861ab3ef")
+      address = insert(:address, contract_code: code)
+      assert AddressView.contract?(address)
+    end
+
+    test "with an account" do
+      address = insert(:address, contract_code: nil)
+      refute AddressView.contract?(address)
+    end
+  end
+
   describe "formatted_usd/2" do
     test "without a fetched_balance returns nil" do
       address = build(:address, fetched_balance: nil)