diff --git a/resources/views/dashboard/components/groups/index.blade.php b/resources/views/dashboard/components/groups/index.blade.php
index 1e0160b9..b76e5b7a 100644
--- a/resources/views/dashboard/components/groups/index.blade.php
+++ b/resources/views/dashboard/components/groups/index.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">
diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php
index e3db3ceb..1615102a 100644
--- a/resources/views/dashboard/components/index.blade.php
+++ b/resources/views/dashboard/components/index.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">
diff --git a/resources/views/dashboard/incidents/index.blade.php b/resources/views/dashboard/incidents/index.blade.php
index 3607fff3..dcfb2a72 100644
--- a/resources/views/dashboard/incidents/index.blade.php
+++ b/resources/views/dashboard/incidents/index.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index 3a46acb1..4822d57d 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -87,7 +87,6 @@
         @endif
     </div>
 </div>
-@if ($welcome_user)
-@include('dashboard.partials.welcome-modal')
-@endif
+
+@includeWhen($welcome_user, 'dashboard.partials.welcome-modal')
 @stop
diff --git a/resources/views/dashboard/maintenance/index.blade.php b/resources/views/dashboard/maintenance/index.blade.php
index 2b28bf30..549e4640 100644
--- a/resources/views/dashboard/maintenance/index.blade.php
+++ b/resources/views/dashboard/maintenance/index.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/analytics.blade.php b/resources/views/dashboard/settings/analytics.blade.php
index 23f622a1..22029618 100644
--- a/resources/views/dashboard/settings/analytics.blade.php
+++ b/resources/views/dashboard/settings/analytics.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php
index 79c55ecb..7facb215 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/credits.blade.php b/resources/views/dashboard/settings/credits.blade.php
index d4cbba66..6c6b54a3 100644
--- a/resources/views/dashboard/settings/credits.blade.php
+++ b/resources/views/dashboard/settings/credits.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/customization.blade.php b/resources/views/dashboard/settings/customization.blade.php
index 30b43864..4272f6f3 100644
--- a/resources/views/dashboard/settings/customization.blade.php
+++ b/resources/views/dashboard/settings/customization.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/localization.blade.php b/resources/views/dashboard/settings/localization.blade.php
index d56eb83d..8219de19 100644
--- a/resources/views/dashboard/settings/localization.blade.php
+++ b/resources/views/dashboard/settings/localization.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/log.blade.php b/resources/views/dashboard/settings/log.blade.php
index 143c6e74..c2b9595a 100644
--- a/resources/views/dashboard/settings/log.blade.php
+++ b/resources/views/dashboard/settings/log.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/mail.blade.php b/resources/views/dashboard/settings/mail.blade.php
index c8217632..0156667a 100644
--- a/resources/views/dashboard/settings/mail.blade.php
+++ b/resources/views/dashboard/settings/mail.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="application-setup">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/security.blade.php b/resources/views/dashboard/settings/security.blade.php
index 25fac073..7d832b2b 100644
--- a/resources/views/dashboard/settings/security.blade.php
+++ b/resources/views/dashboard/settings/security.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="security">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/stylesheet.blade.php b/resources/views/dashboard/settings/stylesheet.blade.php
index 222b1129..33df0451 100644
--- a/resources/views/dashboard/settings/stylesheet.blade.php
+++ b/resources/views/dashboard/settings/stylesheet.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="stylesheet">
             <span class="uppercase">
diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php
index 542214af..951eb3dc 100644
--- a/resources/views/dashboard/settings/theme.blade.php
+++ b/resources/views/dashboard/settings/theme.blade.php
@@ -2,9 +2,7 @@
 
 @section('content')
 <div class="content-panel">
-    @if(isset($sub_menu))
-    @include('dashboard.partials.sub-sidebar')
-    @endif
+    @includeWhen(isset($sub_menu), 'dashboard.partials.sub-sidebar')
     <div class="content-wrapper">
         <div class="header sub-header" id="theme">
             <span class="uppercase">