diff --git a/tubbymemes/templates/about.html b/tubbymemes/templates/about.html
index cb1e4ef..e96d23a 100644
--- a/tubbymemes/templates/about.html
+++ b/tubbymemes/templates/about.html
@@ -2,9 +2,9 @@
 <html>
   {% include 'includes/head.html' %}
   <body>
+  {% include 'includes/navbar.html' %}
   <section class="section">
     <div class="container">
-      {% include 'includes/navbar.html' %}
 
         <div class="columns">
           <div class="column screen" style="padding-top:1em;">
diff --git a/tubbymemes/templates/includes/meme_card.html b/tubbymemes/templates/includes/meme_card.html
index 377d7b1..7d2df90 100644
--- a/tubbymemes/templates/includes/meme_card.html
+++ b/tubbymemes/templates/includes/meme_card.html
@@ -2,7 +2,7 @@
 <div class="card {% if meme.minted %}mintedAVAX{% endif %}">
   <div class="card-image">
     <figure class="image">
-      <a href="{{ url_for('meme.show', meme_id=meme.id) }}">
+      <a href="{{ url_for('meme.show', meme_id=meme.id) }}" up-preload up-follow=".container">
         {% if meme.file_name %}
         {% if meme.file_name.endswith('mp4') %}
           <video class="img-fluid" {% if not request.MOBILE %}autoplay{% else %}controls{% endif %} muted loop>
diff --git a/tubbymemes/templates/includes/navbar.html b/tubbymemes/templates/includes/navbar.html
index 5bf98aa..33db80d 100644
--- a/tubbymemes/templates/includes/navbar.html
+++ b/tubbymemes/templates/includes/navbar.html
@@ -1,29 +1,36 @@
-<div class="screen">
-  <h1 class="title">
-    tubbymemes.
-  </h1>
-  <p class="subtitle">
-    Memes. <strong>Interplanetary</strong>!
-  </p>
-  {% if request.path == '/' %}
-  <a class="button is-secondary" href="{{ url_for('meta.about') }}" up-target=".container">About</a>
-  {% if current_user.is_authenticated %}
-    <a class="button is-danger" href="{{ url_for('meta.disconnect') }}">Disconnect</a>
-    {% if current_user.is_moderator() %}
-      <a class="button is-warning" href="{{ url_for('meme.mod') }}" up-preload up-follow=".container">Mod</a>
-    {% endif %}
-    <a class="button is-primary" href="{{ url_for('meme.publish') }}">New Meme</a>
-  {% else %}
-    <a class="button is-primary" id="metamaskConnect" onclick="onboardMetaMask();">Connect</a>
-  {% endif %}
-  {% else %}
-  <a class="button" href="{{ url_for('meme.index') }}" up-preload up-follow=".container">Go Home</a>
-  {% endif %}
+<nav class="navbar" role="navigation" aria-label="main navigation">
+  <div class="navbar-brand">
+    <a class="navbar-item ml-2" href="{{ url_for('meme.index') }}" up-preload up-follow=".container">
+      <img src="/static/img/logo.png" style="max-height:50px;">
+    </a>
+  </div>
 
-  {% if request.path == '/remotes' %}
-  <a class="button is-warning" href="{{ url_for('meme.mod') }}" up-preload up-follow=".container">Mod</a>
-  {% endif %}
-  {% if request.path == '/mod' %}
-  <a class="button is-warning" href="{{ url_for('meta.remotes') }}" up-preload up-follow=".container">Remotes</a>
-  {% endif %}
-</div>
+  <div id="navbarBasicExample" class="navbar-menu">
+    <div class="navbar-start">
+
+    </div>
+
+    <div class="navbar-end">
+      <a class="navbar-item" href="{{ url_for('meme.index') }}" up-preload up-follow=".container">
+        Home
+      </a>
+
+      <a class="navbar-item" href="{{ url_for('meta.about') }}" up-preload up-follow=".container">
+        About
+      </a>
+      <div class="navbar-item">
+        <div class="buttons">
+          {% if current_user.is_authenticated %}
+            <a class="button is-danger" href="{{ url_for('meta.disconnect') }}">Disconnect</a>
+            {% if current_user.moderator %}
+              <a class="button is-warning" href="{{ url_for('meme.mod') }}" up-preload up-follow=".container">Mod</a>
+            {% endif %}
+            <a class="button is-primary" href="{{ url_for('meme.publish') }}" up-follow=".container">New Meme</a>
+          {% else %}
+            <a class="button is-primary" id="metamaskConnect" onclick="onboardMetaMask();">Connect</a>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+</nav>
diff --git a/tubbymemes/templates/index.html b/tubbymemes/templates/index.html
index 036b6dd..3a8c0b7 100644
--- a/tubbymemes/templates/index.html
+++ b/tubbymemes/templates/index.html
@@ -2,9 +2,9 @@
 <html>
   {% include 'includes/head.html' %}
   <body>
+  {% include 'includes/navbar.html' %}
   <section class="section">
     <div class="container">
-      {% include 'includes/navbar.html' %}
 
       {% if request.args.get('ipfs_error') %}
       <div class="screen">
diff --git a/tubbymemes/templates/meme.html b/tubbymemes/templates/meme.html
index 1af599c..bed7fae 100644
--- a/tubbymemes/templates/meme.html
+++ b/tubbymemes/templates/meme.html
@@ -3,11 +3,10 @@
 <html>
   {% include 'includes/head.html' %}
   <body>
+  {% include 'includes/navbar.html' %}
   <section class="section">
     <div class="container">
 
-      {% include 'includes/navbar.html' %}
-
       {% if meme %}
         {% if meme.meta_ipfs_hash %}
           {% set meta_url = config.IPFS_SERVER + "/ipfs/" + meme.meta_ipfs_hash %}
diff --git a/tubbymemes/templates/publish.html b/tubbymemes/templates/publish.html
index 18d0b56..fab701b 100644
--- a/tubbymemes/templates/publish.html
+++ b/tubbymemes/templates/publish.html
@@ -2,9 +2,9 @@
 <html>
   {% include 'includes/head.html' %}
   <body>
+  {% include 'includes/navbar.html' %}
   <section class="section">
     <div class="container">
-      {% include 'includes/navbar.html' %}
 
       <div class="screen">
       <form method="POST" enctype="multipart/form-data" class="site-form" id="memeUpload" action="{{ url_for('meme.publish') }}" style="padding-top:1.5em;">
diff --git a/tubbymemes/templates/remotes.html b/tubbymemes/templates/remotes.html
index 185ebf5..e01c31e 100644
--- a/tubbymemes/templates/remotes.html
+++ b/tubbymemes/templates/remotes.html
@@ -2,10 +2,9 @@
 <html>
   {% include 'includes/head.html' %}
   <body>
+  {% include 'includes/navbar.html' %}
   <section class="section">
     <div class="container">
-      {% include 'includes/navbar.html' %}
-
       <div class="screen">
       <form method="POST" enctype="multipart/form-data" class="site-form" action="{{ url_for('meta.remotes') }}" style="padding-top:1.5em;">
         <div class="field">
