diff --git a/assets/css/style.css b/assets/css/style.css
index 6eaf032..2ea39cc 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -4,7 +4,7 @@ Theme URI: http://www.pattonwebz.com/best-reloaded-bootstrap-theme
 Description: A responsive, mobile-first, WordPress theme that uses Bootstrap.
 Author: William Patton
 Author URI: http://pattonwebz.com/
-Version: 0.8
+Version: 0.8.1
 Text Domain: best-reloaded
 Tags: left-sidebar, right-sidebar, custom-colors, custom-menu, editor-style, featured-images, full-width-template, theme-options, threaded-comments, translation-ready
 
diff --git a/header.php b/header.php
index cc8863c..406ca25 100644
--- a/header.php
+++ b/header.php
@@ -32,26 +32,25 @@ function theme_slug_render_title() {
     <header>
 
 		<nav class="navbar fixed-top navbar-toggleable-md navbar-light bg-faded">
+			
 		  	<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 		    	<span class="navbar-toggler-icon"></span>
 		  	</button>
-		  	<a class="navbar-brand" href="#">Navbar</a>
 
 		  	<div class="collapse navbar-collapse" id="navbarSupportedContent">
 				<?php
-					wp_nav_menu( array(
-						'menu'       		=> 'nav_topbar',
-						'theme_location' 	=> 'nav_topbar',
-						'depth'      		=> 0,
-						'container'  		=> false,
-						'menu_class' 		=> 'navbar-nav mr-auto',
-						'walker'            => new wp_bootstrap_navwalker()
-					) );
+				wp_nav_menu( array(
+					'menu'       		=> 'nav_topbar',
+					'theme_location' 	=> 'nav_topbar',
+					'depth'      		=> 0,
+					'container'  		=> false,
+					'menu_class' 		=> 'navbar-nav mr-auto',
+					'fallback_cb' 		=> 'topbar_nav_fallback',
+					'walker'            => new wp_bootstrap_navwalker()
+				) );
+
+				get_search_form();
 				?>
-		    	<form class="form-inline my-2 my-lg-0">
-		      		<input class="form-control mr-sm-2" type="text" placeholder="Search">
-		      		<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
-		    	</form>
 		  	</div>
 		</nav>
 
diff --git a/inc/theme-setup.php b/inc/theme-setup.php
index 9d2c658..491b538 100644
--- a/inc/theme-setup.php
+++ b/inc/theme-setup.php
@@ -27,7 +27,7 @@ function pwwp_bestreloaded_setup() {
 
         // Fallback function for Topbar Navigation if it isn't set
         function topbar_nav_fallback() {
-            echo '<ul class="nav navbar-nav"><li><a href="' . home_url() . '" title="Home">Home</a></li></ul>';
+            echo '<ul class="navbar-nav mr-auto"><li class="nav-item"><a href="' . esc_url(home_url()) . '" title="Home" class="nav-link">Home</a></li></ul>';
         }
 
 
diff --git a/screenshot.png b/screenshot.png
index d74c3ba..85054d8 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/searchform.php b/searchform.php
index 1f21435..c9fbd6f 100644
--- a/searchform.php
+++ b/searchform.php
@@ -8,8 +8,8 @@
   * @since Best Reloaded 0.1
   */
 ?>
-<form role="search" method="get" class="navbar-search" action="<?php echo home_url( '/' ); ?>">
-    <label class="visually-hidden" for="s">Search:</label>
-    <input type="text" class="search-query" placeholder="type and hit &#x0022;enter&#x0022; to search" name="s" id="s" />
-    <input type="submit" class="hidden" id="searchsubmit" value="Search" />
+<form role="search" method="get" class="form-inline my2 my-lg-0" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+    <label class="visually-hidden sr-only" for="s">Search:</label>
+    <input type="text" class="form-control mr-sm-2" placeholder="<?php echo esc_attr('type and hit "enter" to search'); ?>" name="s" id="s" />
+    <button type="submit" class="btn btn-outline-success my-2 my-sm-0" id="searchsubmit" value="Search" />Search</button>
 </form>
diff --git a/style.css b/style.css
index 09ebe73..b13df8b 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: http://www.pattonwebz.com/best-reloaded-bootstrap-theme
 Description: A responsive, mobile-first, WordPress theme that uses Bootstrap.
 Author: William Patton
 Author URI: http://pattonwebz.com/
-Version: 0.8
+Version: 0.8.1
 Text Domain: best-reloaded
 Tags: left-sidebar, right-sidebar, custom-colors, custom-menu, editor-style, featured-images, full-width-template, theme-options, threaded-comments, translation-ready