diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 35471f6f..219186be 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -13,7 +13,12 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        if(!file_exists(database_path(env('DB_DATABASE')))) {
+            // first time setup
+            //die("No Database");
+            touch(database_path(env('DB_DATABASE')));
+            \Artisan::call('migrate', array('--path' => 'app/migrations', '--force' => true));
+        }
     }
 
     /**
diff --git a/config/database.php b/config/database.php
index 8e78cee3..f2f0ab1d 100644
--- a/config/database.php
+++ b/config/database.php
@@ -36,7 +36,7 @@ return [
         'sqlite' => [
             'driver' => 'sqlite',
             //'database' => env('DB_DATABASE', database_path('database.sqlite')),
-            'database' => database_path(env('DB_DATABASE'))
+            'database' => database_path(env('DB_DATABASE')),
             'prefix' => '',
         ],
 
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
new file mode 100644
index 00000000..1c84435a
--- /dev/null
+++ b/resources/views/app.blade.php
@@ -0,0 +1,36 @@
+<!doctype html>
+<html lang="{{ app()->getLocale() }}">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>{{ config('app.name') }}</title>
+
+        <link rel="stylesheet" href="{{ mix('/css/app.css') }}" type="text/css" />
+
+    </head>
+    <body>
+        <div id="app">
+            <nav>
+                <ul>
+                    <li><a href=""><i class="fa fa-dash"></i></a></li>
+                    <li><a href=""><i class="fa fa-dash"></i></a></li>
+                    <li><a href=""><i class="fa fa-dash"></i></a></li>
+                </ul>
+            </nav>
+            <div class="content">
+                <header>
+                    test
+                </header>
+                <main>
+                    @yield('content')
+                </main>
+
+                <footer>
+                    test
+                </footer>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 53208c2c..bd74bae8 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,38 +1,10 @@
-<!doctype html>
-<html lang="{{ app()->getLocale() }}">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+@extends('app')
 
-        <title>{{ config('app.name') }}</title>
+@section('content')
 
-        <link rel="stylesheet" href="{{ mix('/css/app.css') }}" type="text/css" />
-
-    </head>
-    <body>
-        <div id="app">
-            <nav>
-                <ul>
-                    <li><a href=""><i class="fa fa-dash"></i></a></li>
-                    <li><a href=""><i class="fa fa-dash"></i></a></li>
-                    <li><a href=""><i class="fa fa-dash"></i></a></li>
-                </ul>
-            </nav>
-            <div class="content">
-                <header>
-                    test
-                </header>
-                <main>
                     <section class="item">
                         Item
                     </section>
-                </main>
 
-                <footer>
-                    test
-                </footer>
-            </div>
-        </div>
-    </body>
-</html>
+
+@endsection
\ No newline at end of file
