diff --git a/pages/_components/widget-revenue.html b/pages/_components/widget-revenue.html
index b7644c126..1aa376489 100644
--- a/pages/_components/widget-revenue.html
+++ b/pages/_components/widget-revenue.html
@@ -1,6 +1,5 @@
 ---
 title: Revenue chart
-columns: 1
 ---
 
 {% include cards/charts/revenue.html %}
diff --git a/pages/_docs/form-elements.md b/pages/_docs/form-elements.md
index a5e7c142c..4e6214806 100644
--- a/pages/_docs/form-elements.md
+++ b/pages/_docs/form-elements.md
@@ -56,7 +56,7 @@ title: Form Elements
 {% example %}
 <div class="mb-2">
    <label class="form-label">Country</label>
-   <select class="form-control custom-select">
+   <select class="form-select">
       <option value="">Germany</option>
       <option value="">USA</option>
       <option value="">Poland</option>
@@ -334,7 +334,7 @@ title: Form Elements
    <label class="form-label">Date of birth</label>
    <div class="row row-xs">
       <div class="col-5">
-         <select name="user[month]" class="form-control custom-select">
+         <select name="user[month]" class="form-select">
             <option value="">Month</option>
             <option value="1">January</option>
             <option value="2">February</option>
@@ -351,14 +351,14 @@ title: Form Elements
          </select>
       </div>
       <div class="col-3">
-         <select name="user[day]" class="form-control custom-select">
+         <select name="user[day]" class="form-select">
             <option value="">Day</option>
             {% for i in (1..31) %}
             <option value="{{ i }}"{% if i == 20 %} selected{% endif %}>{{ i }}</option>{% endfor %}
          </select>
       </div>
       <div class="col-4">
-         <select name="user[year]" class="form-control custom-select">
+         <select name="user[year]" class="form-select">
             <option value="">Year</option>
             {% for i in (1897..2014) reversed %}
             <option value="{{ i }}"{% if i == 1989 %} selected{% endif %}>{{ i }}</option>{% endfor %}
diff --git a/pages/_includes/cards/profile-edit-big.html b/pages/_includes/cards/profile-edit-big.html
index d67f21d02..dd2bf03e5 100644
--- a/pages/_includes/cards/profile-edit-big.html
+++ b/pages/_includes/cards/profile-edit-big.html
@@ -54,7 +54,7 @@
          <div class="col-md-5">
             <div class="mb-2">
                <label class="form-label">Country</label>
-               <select class="form-control custom-select">
+               <select class="form-select">
                   <option value="">Germany</option>
                </select>
             </div>
diff --git a/pages/_includes/forms/form-elements-1.html b/pages/_includes/forms/form-elements-1.html
index 59c80f3a6..bf205e7ba 100644
--- a/pages/_includes/forms/form-elements-1.html
+++ b/pages/_includes/forms/form-elements-1.html
@@ -1,22 +1,22 @@
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Static</label>
    <div class="form-control-plaintext">Username</div>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Text</label>
    <input type="text" class="form-control" name="example-text-input" placeholder="Text..">
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Disabled</label>
    <input type="text" class="form-control" name="example-disabled-input" placeholder="Disabled.."
           value="Well, she turned me into a newt." disabled>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Readonly</label>
    <input type="text" class="form-control" name="example-disabled-input" placeholder="Disabled.."
           value="Well, how'd you become king, then?" readonly>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Textarea <span class="float-right text-muted-light">56/100</span></label>
    <textarea class="form-control" name="example-textarea-input" rows="6" placeholder="Content..">Oh! Come and see the violence inherent in the system! Help, help, I'm being repressed! We shall say 'Ni' again to you, if you do not appease us. I'm not a witch. I'm not a witch. Camelot!</textarea>
 </div>
@@ -25,7 +25,7 @@
 
 {% include parts/input-color.html %}
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Input group</label>
    <div class="input-group">
       <input type="text" class="form-control" placeholder="Search for&hellip;">
@@ -34,7 +34,7 @@
 						</span>
    </div>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Input group buttons</label>
    <div class="input-group">
       <input type="text" class="form-control">
@@ -60,26 +60,25 @@
 
 {% include parts/input-icon.html %}
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Separated inputs</label>
    <div class="row row-xs">
       <div class="col">
          <input type="text" class="form-control" placeholder="Search for&hellip;">
       </div>
-      <span class="col-auto">
-							<button class="btn btn-secondary" type="button">{% include ui/icon.html icon="search" %}</button>
-						</span>
+      <div class="col-auto">
+         <button class="btn btn-secondary" type="button">{% include ui/icon.html icon="search" %}</button>
+      </div>
    </div>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">ZIP Code</label>
    <div class="row row-sm">
       <div class="col">
          <input type="text" class="form-control" placeholder="Search for&hellip;">
       </div>
-      <span class="col-auto align-self-center">
-							<span class="form-help" data-toggle="popover" data-placement="top"
-                           data-content="<p>ZIP Code must be US or CDN format. You can use an extended ZIP+4 code to determine address more accurately.</p><p class='mb-0'><a href=''>USP ZIP codes lookup tools</a></p>">?</span>
-						</span>
+      <div class="col-auto align-self-center">
+         <span class="form-help" data-toggle="popover" data-placement="top" data-content="<p>ZIP Code must be US or CDN format. You can use an extended ZIP+4 code to determine address more accurately.</p><p class='mb-0'><a href=''>USP ZIP codes lookup tools</a></p>">?</span>
+      </div>
    </div>
 </div>
diff --git a/pages/_includes/forms/form-elements-2.html b/pages/_includes/forms/form-elements-2.html
index fbc839061..6d5e18947 100644
--- a/pages/_includes/forms/form-elements-2.html
+++ b/pages/_includes/forms/form-elements-2.html
@@ -1,9 +1,9 @@
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Password</label>
    <input type="password" class="form-control" name="example-password-input" placeholder="Password..">
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Valid State</label>
    <input type="text" class="form-control is-valid" name="example-text-input-valid"
           placeholder="Valid State..">
@@ -11,7 +11,7 @@
    <input type="text" class="form-control mt-3 state-valid" value="Valid state">
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Invalid State</label>
    <input type="text" class="form-control is-invalid" name="example-text-input-invalid"
           placeholder="Invalid State..">
@@ -20,35 +20,35 @@
    <input type="text" class="form-control mt-3 state-invalid" value="Invalid state">
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Country</label>
-   <select class="form-control custom-select">
+   <select class="form-select">
       <option value="">Germany</option>
    </select>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Ratios</label>
    <input type="range" class="form-range" step="5" min="0" max="50">
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Size</label>
    {% include ui/input-selectgroup.html values="S,M,L,XL,XXL" type="radio" name="size" %}
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Shipping methods</label>
    {% include ui/input-selectgroup.html values="Unregistered,Priority Mail,Express Mail" class="selectgroup-vertical" type="radio" name="shipping-method" %}
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Icons input</label>
    {% include ui/input-selectgroup.html values="i:smartphone,i:tablet,i:monitor,i:x" class="w-100" type="radio" name="device" %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Icon input</label>
    {% include ui/input-selectgroup.html values="i:sun,i:moon,i:cloud-rain,i:cloud,Other" class="selectgroup-pills" %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Your skills</label>
    {% include ui/input-selectgroup.html values="HTML,CSS,PHP,JavaScript" class="selectgroup-pills" %}
 </div>
diff --git a/pages/_includes/forms/form-elements-3.html b/pages/_includes/forms/form-elements-3.html
index d015efdfd..4b94a41cc 100644
--- a/pages/_includes/forms/form-elements-3.html
+++ b/pages/_includes/forms/form-elements-3.html
@@ -1,4 +1,4 @@
-<div class="mb-2">
+<div class="mb-3">
    <div class="form-label">Radios</div>
    <div>
       {% include ui/form/check.html title="Option 1" type="radio" %}
@@ -7,7 +7,7 @@
    </div>
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <div class="form-label">Inline Radios</div>
    <div>
       {% include ui/form/check.html title="Option 1" type="radio" inline=true %}
@@ -15,7 +15,7 @@
       {% include ui/form/check.html title="Option 3" type="radio" inline=true %}
    </div>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <div class="form-label">Checkboxes</div>
    <div>
       {% include ui/form/check.html type="checkbox" %}
@@ -23,7 +23,7 @@
       {% include ui/form/check.html type="checkbox" checked=true %}
    </div>
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <div class="form-label">Inline Checkboxes</div>
    <div>
       {% include ui/form/check.html inline=true title="Option 1" type="checkbox" %}
@@ -33,11 +33,11 @@
 </div>
 {% include parts/input-toggle.html %}
 
-<div class="mb-2">
+<div class="mb-3">
    <div class="form-label">Toggle switch single</div>
    {% include ui/form/check.html title="I agree with terms and conditions" switch=true %}
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <div class="form-label">Bootstrap's Custom File Input</div>
    <div class="custom-file">
       <input type="file" class="custom-file-input" name="example-file-input-custom">
@@ -45,11 +45,11 @@
    </div>
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Date of birth</label>
    <div class="row row-xs">
       <div class="col-5">
-         <select name="user[month]" class="form-control custom-select">
+         <select name="user[month]" class="form-select">
             <option value="">Month</option>
             <option value="1">January</option>
             <option value="2">February</option>
@@ -66,14 +66,14 @@
          </select>
       </div>
       <div class="col-3">
-         <select name="user[day]" class="form-control custom-select">
+         <select name="user[day]" class="form-select">
             <option value="">Day</option>
             {% for i in (1..31) %}
             <option value="{{ i }}"{% if i == 20 %} selected{% endif %}>{{ i }}</option>{% endfor %}
          </select>
       </div>
       <div class="col-4">
-         <select name="user[year]" class="form-control custom-select">
+         <select name="user[year]" class="form-select">
             <option value="">Year</option>
             {% for i in (1897..2014) reversed %}
             <option value="{{ i }}"{% if i == 1989 %} selected{% endif %}>{{ i }}</option>{% endfor %}
@@ -83,27 +83,27 @@
 </div>
 
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Username</label>
    {% include ui/input-group.html prepend="@" placeholder="username" %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Subdomain</label>
    {% include ui/input-group.html append=".tabler.io" placeholder="subdomain" %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Your vanity URL</label>
    {% include ui/input-group.html prepend="https://example.com/users/" %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Price</label>
    {% include ui/input-group.html prepend="$" append=".00" %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Button input</label>
    <div class="input-group">
       <div class="input-group-prepend">
@@ -123,23 +123,23 @@
    </div>
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Tags</label>
    <input type="text" class="form-control" id="input-tags" value="aa,bb,cc,dd">
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Beast</label>
-   <select name="beast" id="select-beast" class="form-control custom-select">
+   <select name="beast" id="select-beast" class="form-select">
       <option value="1">Chuck Testa</option>
       <option value="4">Sage Cattabriga-Alosa</option>
       <option value="3">Nikola Tesla</option>
    </select>
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Users list</label>
-   <select name="user" id="select-users" class="form-control custom-select">
+   <select name="user" id="select-users" class="form-select">
       {% for user in site.data.people limit: 10 %}
       <option value="{{ forloop.index }}" data-data='{"image": "{{ user.photo }}"}'>
          {{ user.first_name }} {{ user.last_name }}
@@ -148,9 +148,9 @@
    </select>
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Countries</label>
-   <select name="country" id="select-countries" class="form-control custom-select">
+   <select name="country" id="select-countries" class="form-select">
       <option value="br" data-data='{"image": "{{ site.base }}/assets/images/flags/br.svg"}'>Brazil</option>
       <option value="cz" data-data='{"image": "{{ site.base }}/assets/images/flags/cz.svg"}'>Czech Republic
       </option>
diff --git a/pages/_includes/forms/form-elements-5.html b/pages/_includes/forms/form-elements-5.html
index 365c3639e..250868982 100644
--- a/pages/_includes/forms/form-elements-5.html
+++ b/pages/_includes/forms/form-elements-5.html
@@ -1,13 +1,13 @@
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Text mask</label>
    {% include ui/input-mask.html mask="00/00/0000" placeholder="00/00/0000" visible=true %}
 </div>
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Telephone mask</label>
    {% include ui/input-mask.html mask="(00) 0000-0000" placeholder="(00) 0000-0000" visible=true %}
 </div>
 
-<div class="mb-2">
+<div class="mb-3">
    <label class="form-label">Autosize textarea</label>
    <textarea class="form-control" data-toggle="autosize" placeholder="Typing something&hellip;"></textarea>
 </div>
diff --git a/pages/_includes/layout/menu.html b/pages/_includes/layout/menu.html
index 16dcb228b..022f96373 100644
--- a/pages/_includes/layout/menu.html
+++ b/pages/_includes/layout/menu.html
@@ -1,5 +1,6 @@
+{% removeemptylines %}
 <ul class="navbar-nav{% if include.class %} {{ include.class }}{% endif %}" id="menu">
-   {% assign current-page = include.menu | split: '.' %}
+   {% assign current-page = page.menu | default: layout.menu | split: '.' %}
 
    {% for level-1 in site.data.menu %}
    {% assign icon = level-1[1].icon %}
@@ -96,3 +97,4 @@
    </li>
    {% endfor %}
 </ul>
+{% endremoveemptylines %}
diff --git a/pages/users-list.html b/pages/users-list.html
index 6ac06d8e2..6452610d1 100644
--- a/pages/users-list.html
+++ b/pages/users-list.html
@@ -41,7 +41,7 @@ done: true
             </div>
             <div class="mb-2">
                <div class="form-label">Country</div>
-               <select class="custom-select form-control">
+               <select class="form-select">
                   <option value="">United States</option>
                </select>
             </div>