diff --git a/lib/generators/layout/install/templates/bootstrap4-forms.css.scss b/lib/generators/layout/install/templates/bootstrap4-forms.css.scss
deleted file mode 100644
index 88b3918..0000000
--- a/lib/generators/layout/install/templates/bootstrap4-forms.css.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// Styles for form views
-// using Bootstrap 4
-// generated by the rails_layout gem
-.authform {
-  padding-top: 30px;
-  max-width: 320px;
-  margin: 0 auto;
-}
-.authform form {
-  @extend .card;
-  @extend .col-md-9;
-  padding-bottom: 40px;
-  @extend .bg-faded;
-  @extend .small;
-}
-.authform .right {
-  float: right !important;
-}
-.authform .button {
-  @extend .btn;
-  @extend .btn-primary;
-}
-.authform fieldset {
-  @extend .card;
-}
-#error_explanation:not(:empty) {
-  @extend .alert;
-  @extend .alert-danger;
-}
-#error_explanation h2 {
-  font-size: 16px;
-}
-.button-xs {
-  @extend .btn;
-  @extend .btn-primary;
-  @extend .btn-sm;
-}
diff --git a/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb b/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb
index e3a2035..f188f95 100644
--- a/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb
+++ b/lib/generators/layout/install/templates/bootstrap4-navigation.html.erb
@@ -1,18 +1,14 @@
 <%# navigation styled for Bootstrap 4.0 %>
-<div class="container">
-  <nav class="navbar navbar-dark bg-inverse">
-    <ul class="nav navbar-nav clearfix">
-      <li class="nav-item">
-        <button class="navbar-toggler hidden-sm-up nav-link" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation">
-          &#9776;
-        </button>
-      </li>
-    </ul>
-    <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
-      <%= link_to "Rails bootstrap", root_path, class: 'navbar-brand' %>
-      <ul class="nav navbar-nav">
+<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
+  <div class="container">
+    <button aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" class="navbar-toggler navbar-toggler-right" data-target="#navbarSupportedContent" data-toggle="collapse" type="button">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <%= link_to 'Rails Bootstrap', root_path, class: 'navbar-brand' %>
+    <div class="collapse navbar-collapse justify-content-end">
+      <ul class="navbar-nav">
         <%= render 'layouts/navigation_links' %>
       </ul>
     </div>
-  </nav>
-</div>
+  </div>
+</nav>
diff --git a/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml b/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml
index 9620579..c1196bf 100644
--- a/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml
+++ b/lib/generators/layout/install/templates/bootstrap4-navigation.html.haml
@@ -1,10 +1,8 @@
--# navigation styled for Bootstrap 3.0
-.container
-  %nav.navbar.navbar-dark.bg-inverse
-    %ul.nav.navbar-nav.clearfix
-      %li.nav-item
-        %button.navbar-toggler.hidden-sm-up.nav-link{"aria-controls" => "exCollapsingNavbar2", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#exCollapsingNavbar2", "data-toggle" => "collapse", :type => "button"}
-          \ &#9776;
-    #exCollapsingNavbar2.collapse.navbar-toggleable-xs
-      = link_to "Rails bootstrap", root_path, class: 'navbar-brand'
-      %ul.nav.navbar-nav= render 'layouts/navigation_links'
+-# navigation styled for Bootstrap v4 alpha 6
+%nav.navbar.navbar-toggleable-md.navbar-light.bg-faded
+	.container
+		%button.navbar-toggler.navbar-toggler-right{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", :type => "button"}
+			%span.navbar-toggler-icon
+		= link_to "Rails Bootstrap", root_path, class: 'navbar-brand'
+		.collapse.navbar-collapse.justify-content-end
+			%ul.navbar-nav= render 'layouts/navigation_links'
diff --git a/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim b/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim
index 24caf15..eaac16a 100644
--- a/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim
+++ b/lib/generators/layout/install/templates/bootstrap4-navigation.html.slim
@@ -1,11 +1,8 @@
-/ navigation styled for Bootstrap 4.0
-.container
-  nav.navbar.navbar-dark.bg-inverse
-    ul.nav.navbar-nav.clearfix
-      li.nav-item
-        button.navbar-toggler.hidden-sm-up.nav-link aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label=("Toggle navigation") data-target="#exCollapsingNavbar2" data-toggle="collapse" type="button"
-          | &#9776;
-    #exCollapsingNavbar2.collapse.navbar-toggleable-xs
-      = link_to "Rails bootstrap", root_path, class: 'navbar-brand'
-      ul.nav.navbar-nav
+nav.navbar.navbar-toggleable-md.navbar-light.bg-faded
+	.container
+		button.navbar-toggler.navbar-toggler-right aria-controls="navbarSupportedContent", aria-expanded="false", aria-label=("Toggle navigation"), data-target="#navbarSupportedContent", data-toggle=>"collapse", type="button"
+			span.navbar-toggler-icon
+		= link_to Rails.configuration.site_title, root_path, class: 'navbar-brand'
+		.collapse.navbar-collapse.justify-content-end
+			ul.navbar-nav
         = render 'layouts/navigation_links'
diff --git a/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss b/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss
index f36e8b8..d61414e 100644
--- a/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss
+++ b/lib/generators/layout/install/templates/bootstrap4_and_overrides.css.scss
@@ -17,14 +17,14 @@ img {
 // to make views framework-neutral
 .column {
   @extend .col-md-6;
-  @extend .text-xs-center;
+  @extend .text-center;
 }
 .form {
   @extend .col-md-6;
 }
 .form-centered {
   @extend .col-md-6;
-  @extend .text-xs-center;
+  @extend .text-center;
 }
 .submit {
   @extend .btn;
@@ -43,3 +43,40 @@ section {
   @extend .row;
   margin-top: 20px;
 }
+
+// Styles for form views
+// using Bootstrap 4
+// generated by the rails_layout gem
+.authform {
+  @extend .mt-5; // margin-top
+  h3, p {
+    @extend .text-center
+  }
+}
+.authform form {
+  @extend .card;
+  @extend .card-block;
+  @extend .col-md-6;
+  @extend .offset-md-3;
+  @extend .mb-3;
+  @extend .bg-faded;
+}
+.authform .button {
+  @extend .btn;
+  @extend .btn-primary;
+}
+//.authform fieldset {
+//  @extend .card;
+//}
+#error_explanation:not(:empty) {
+  @extend .alert;
+  @extend .alert-danger;
+}
+#error_explanation h2 {
+  font-size: 16px;
+}
+.button-xs {
+  @extend .btn;
+  @extend .btn-primary;
+  @extend .btn-sm;
+}