diff --git a/layouts/partials/home_hero.html b/layouts/partials/home_hero.html
index 46240a7..e10d9b4 100644
--- a/layouts/partials/home_hero.html
+++ b/layouts/partials/home_hero.html
@@ -1,4 +1,4 @@
-<section id="homepage-hero" class="hero is-medium is-primary is-bold">
+<section id="homepage-hero" class="hero is-primary is-bold">
     <div class="hero-head">
         <!-- is-dark / is-light is set by hero.js for the homepage hero -->
         <nav id="hero-navbar" class="navbar is-size-6 is-fixed-top" role="navigation" aria-label="main navigation">
@@ -7,20 +7,27 @@
     </div>
 
     <div class="hero-body">
-        <div class="container">
-            <div class="columns">
-                <!-- Left panel -->
-                <div class="column is-centered-vertically is-5">
-                    {{ partial "home_hero_contents" . }}
-                </div>
+        <section class="section">
+            <div class="container">
+                <!-- is-dark / is-light is set by hero.js for the homepage hero -->
+                <nav id="hero-navbar" class="navbar is-size-6 is-fixed-top" role="navigation" aria-label="main navigation">
+                    {{ partial "layout/navbar_contents" . }}
+                </nav>
 
-                <!-- Right panel -->
-                <div class="column is-7">
-                    <figure class="image is-16by9">
-                        <img src="{{ .Site.BaseURL}}/images/jumbotron.png" />
-                    </figure>
+                <div class="columns">
+                    <!-- Left panel -->
+                    <div class="column is-centered-vertically is-5">
+                        {{ partial "home_hero_contents" . }}
+                    </div>
+
+                    <!-- Right panel -->
+                    <div class="column is-7 is-hidden-mobile">
+                        <figure class="image is-16by9">
+                            <img src="{{ .Site.BaseURL}}/images/jumbotron.png" />
+                        </figure>
+                    </div>
                 </div>
             </div>
-        </div>
     </div>
+    </section>
 </section>
\ No newline at end of file
diff --git a/layouts/partials/layout/navbar_contents.html b/layouts/partials/layout/navbar_contents.html
index fc50588..7b56655 100644
--- a/layouts/partials/layout/navbar_contents.html
+++ b/layouts/partials/layout/navbar_contents.html
@@ -6,42 +6,39 @@
     </div>
     <div class="navbar-menu">
         <div class="navbar-end">
-            {{ $currentPage := . }}
-            {{ range .Site.Menus.main }}
-                {{ if .HasChildren }}
-                    <div class="navbar-item has-dropdown is-hoverable">
-                            <a class="navbar-item">
-                                {{ .Name }}
-            
-                                <span class="icon">
-                                    <i class="fas fa-caret-down"></i>
-                                </span>
-                            </a>
-                            <div class="navbar-dropdown">
-                                {{ range .Children }}
-                                    <a class="navbar-item {{ if $currentPage.IsMenuCurrent "main" . }} is-active{{ end }}" href="{{ .URL }}">
-                                        {{ .Name }}
-                                    </a>
-                                {{ end }}
-                            </div>
-                        </div>
-                {{ else }}
-                    <a class="navbar-item {{ if $currentPage.IsMenuCurrent "main" . }} is-active{{ end }}" href="{{ .URL }}">
+            {{ $currentPage := . }} {{ range .Site.Menus.main }} {{ if .HasChildren }}
+            <div class="navbar-item has-dropdown is-hoverable">
+                <a class="navbar-item">
+                    {{ .Name }}
+
+                    <span class="icon">
+                        <i class="fas fa-caret-down"></i>
+                    </span>
+                </a>
+                <div class="navbar-dropdown">
+                    {{ range .Children }}
+                    <a class="navbar-item {{ if $currentPage.IsMenuCurrent " main " . }} is-active{{ end }}" href="{{ .URL }}">
                         {{ .Name }}
                     </a>
-                {{ end }}
-            {{ end }}
-            <!-- Navbar icons -->
-            <a class="navbar-item is-hidden-desktop-only" href="{{ .Site.Params.TwitterURL }}" target="_blank">
-                <span class="icon">
-                    <i class="fab fa-2x fa-twitter"></i>
-                </span>
+                    {{ end }}
+                </div>
+            </div>
+            {{ else }}
+            <a class="navbar-item {{ if $currentPage.IsMenuCurrent " main " . }} is-active{{ end }}" href="{{ .URL }}">
+                {{ .Name }}
             </a>
+            {{ end }} {{ end }}
+            <!-- Navbar icons -->
             <a class="navbar-item is-hidden-desktop-only" href="{{ .Site.Params.DiscordURL }}" target="_blank">
                 <span class="icon">
                     <i class="fab fa-2x fa-discord"></i>
                 </span>
             </a>
+            <a class="navbar-item is-hidden-desktop-only" href="{{ .Site.Params.TwitterURL }}" target="_blank">
+                <span class="icon">
+                    <i class="fab fa-2x fa-twitter"></i>
+                </span>
+            </a>
             <a class="navbar-item is-hidden-desktop-only" href="{{ .Site.Params.GithubURL }}" target="_blank">
                 <span class="icon">
                     <i class="fab fa-2x fa-github"></i>
@@ -49,4 +46,4 @@
             </a>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/widget/tweet.html b/layouts/partials/widget/tweet.html
index dd617e6..91f5fe1 100644
--- a/layouts/partials/widget/tweet.html
+++ b/layouts/partials/widget/tweet.html
@@ -2,20 +2,12 @@
     <div class="card">
         <div class="card-content">
             <div class="columns">
-                <div class="column is-2">
-                    <figure class="image is-square">
-                        <img src="{{ .Site.BaseURL}}/images/twitterAvatar.png" />
-                    </figure>
-                </div>
                 <div class="column">
-                    <p class="title is-4">{{ .author }}</p>
-                    <p class="subtitle is-6">
-                        <time datetime="2016-1-1">{{ .date }}</time> by @{{ .author }}</p>
+                    <p class="title is-4">@{{ .author }}</p>
                 </div>
             </div>
-            <div class="content">
-                {{ .message }}
-            </div>
+            <div class="content">{{ .message }}</div>
+            <div><time datetime="2016-1-1">Posted on {{ .date }}</time></div>
         </div>
     </div>
 </a>
\ No newline at end of file