diff --git a/navwalker.php b/navwalker.php
index 983fd7d..6a589b4 100644
--- a/navwalker.php
+++ b/navwalker.php
@@ -18,44 +18,40 @@
 
 	class Navwalker extends Walker_Nav_Menu {
 
-        public function start_lvl( &$output, $depth = 0, $args = array() ) {
-           
-            $output .= "<div class='navbar-dropdown'>";
-        }
-
         public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
 
-            $liClasses = 'navbar-item '.$item->title;
+            $lowerCaseTitle = strtolower($item->title);
+            $linkTitle = str_replace(' ', '', $lowerCaseTitle);
+            $liClasses = 'navbar-item '.$linkTitle;
 
             $hasChildren = $args->walker->has_children;
-            $liClasses .= $hasChildren? " has-dropdown is-hoverable": "";
+            $liClasses .= $hasChildren ? " has-dropdown is-hoverable": "";
 
-            if($hasChildren){
-                $output .= "<div class='".$liClasses."'>";
-                $output .= "\n<a class='navbar-link' href='".$item->url."'>".$item->title."</a>";
-            }
-            else {
-                $output .= "<a class='".$liClasses."' href='".$item->url."'>".$item->title;
-            }
+            $linkClasses = $hasChildren ? "" : "is-arrowless";
+
+            $output .= '<li class="'.$liClasses.'">';
+
+            $output .= '<a class="navbar-link '.$linkClasses.'" href="'.$item->url.'">'.$item->title.'</a>';
 
             // Adds has_children class to the item so end_el can determine if the current element has children
             if ( $hasChildren ) {
-                $item->classes[] = 'has_children';
+                $item->classes[] = "has_children";
             }
         }
-        
-        public function end_el(&$output, $item, $depth = 0, $args = array(), $id = 0 ){
 
-            if(in_array("has_children", $item->classes)) {
-
-                $output .= "</div>";
-            }
-            $output .= "</a>";
+        public function start_lvl( &$output, $depth = 0, $args = array() ) {
+            $output .= '<ul class="navbar-dropdown">';
         }
 
         public function end_lvl (&$output, $depth = 0, $args = array()) {
+            $output .= "</ul>";
+        }
+
+        public function end_el(&$output, $item, $depth = 0, $args = array(), $id = 0 ){
+
+            $output .= "</li>";
 
-            $output .= "</div>";
         }
+
     }
 ?>
\ No newline at end of file