diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 6fa63484..38bd72c0 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -13,12 +13,39 @@ require('./bootstrap');
 
 window.Vue = require('vue');
 
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
+window.axios = require('axios');
 
-const app = new Vue({
-    el: '#app'
-});
+window.axios.defaults.headers.common = {
+    'X-CSRF-Token': window.Global.csrfToken,
+    'X-Requested-With': 'XMLHttpRequest'
+};
+
+((win, doc) => {
+    /**
+     * Next, we will create a fresh Vue application instance and attach it to
+     * the page. Then, you may begin adding components to this application
+     * or customize the JavaScript scaffolding to fit your unique needs.
+     */
+
+    new Vue({
+        el: '#app',
+        data () {
+            return {
+                // TODO: Fill this with the active user.
+                user: null,
+                messages: [
+                    //
+                ],
+                system: {
+                    updateAvailable: false,
+                }
+            }
+        },
+        components: {
+            'setup': require('./components/Setup.js'),
+            'dashboard': require('./components/dashboard/Dashboard.js'),
+            'report-incident': require('./components/dashboard/ReportIncident.js'),
+            'invite-team': require('./components/dashboard/InviteTeam.js'),
+        }
+    })
+})()
diff --git a/resources/assets/js/cachet.js b/resources/assets/js/cachet.js
index 31ea20e6..2444940a 100644
--- a/resources/assets/js/cachet.js
+++ b/resources/assets/js/cachet.js
@@ -3,7 +3,7 @@ $(function () {
     $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
         var token;
         if (! options.crossDomain) {
-            token = $('meta[name="token"]').attr('content');
+            token = window.Global.csrfToken;
             if (token) {
                 jqXHR.setRequestHeader('X-CSRF-Token', token);
             }
@@ -232,7 +232,7 @@ $(function () {
     });
 
     // Incident management
-    $('select[name=template]').on('change', function () {
+    /*$('select[name=template]').on('change', function () {
         var $this = $(this).find('option:selected'),
             slug   = $this.val();
 
@@ -254,7 +254,7 @@ $(function () {
                 }
             });
         }
-    });
+    });*/
 
     // Banner removal JS
     $('#remove-banner').on('click', function (){
diff --git a/resources/assets/js/components/Setup.js b/resources/assets/js/components/Setup.js
new file mode 100644
index 00000000..6bb0e73d
--- /dev/null
+++ b/resources/assets/js/components/Setup.js
@@ -0,0 +1,49 @@
+module.exports = {
+    props: [],
+    data () {
+        return {
+            env: {
+                cache_driver: null,
+                queue_driver: null,
+                session_driver: null,
+                mail_driver: null,
+            },
+            mail: {
+                host: null,
+                from: {
+                    email: null,
+                    name: 'status@cachethq.io',
+                },
+                username: null,
+                password: null,
+
+                requiresHost: true,
+                requiresUsername: true,
+                requiresPassword: true,
+            },
+            system: {
+                name: null,
+                domain: null,
+                timezone: null,
+                language: null
+            }
+        }
+    },
+    watch: {
+        'env.mail_driver' (driver) {
+            if (driver === 'log' || driver === 'mail') {
+                this.mail.requiresHost = false
+                this.mail.requiresUsername = false
+                this.mail.requiresPassword = false
+            } else if (driver === 'ses' || driver === 'mandrill') {
+                this.mail.requiresHost = false
+                this.mail.requiresUsername = true
+                this.mail.requiresPassword = true
+            } else {
+                this.mail.requiresHost = true
+                this.mail.requiresUsername = true
+                this.mail.requiresPassword = true
+            }
+        }
+    }
+}
diff --git a/resources/assets/js/components/dashboard/Dashboard.js b/resources/assets/js/components/dashboard/Dashboard.js
new file mode 100644
index 00000000..176907f7
--- /dev/null
+++ b/resources/assets/js/components/dashboard/Dashboard.js
@@ -0,0 +1,16 @@
+module.exports = {
+    props: ['welcome-user'],
+    mounted () {
+        if (this.welcomeUser) {
+            $('#welcome-modal').modal('show');
+        }
+    },
+    methods: {
+        fetchIncidentTimeline () {
+            //
+        },
+        fetchSubscriberTimeline () {
+            //
+        }
+    }
+}
diff --git a/resources/assets/js/components/dashboard/InviteTeam.js b/resources/assets/js/components/dashboard/InviteTeam.js
new file mode 100644
index 00000000..20812706
--- /dev/null
+++ b/resources/assets/js/components/dashboard/InviteTeam.js
@@ -0,0 +1,29 @@
+module.exports = {
+    data () {
+        return {
+            canRemove: true,
+            emails: [
+                { email: '' },
+                { email: '' },
+                { email: '' },
+                { email: '' },
+                { email: '' },
+            ]
+        }
+    },
+    methods: {
+        add () {
+            this.emails.push("")
+        },
+        remove (key) {
+            if (this.canRemove) {
+                this.$delete(this.emails, key)
+            }
+        },
+    },
+    watch: {
+        'emails' (val) {
+            this.canRemove = val.length > 1
+        }
+    }
+}
diff --git a/resources/assets/js/components/dashboard/ReportIncident.js b/resources/assets/js/components/dashboard/ReportIncident.js
new file mode 100644
index 00000000..8d6ade64
--- /dev/null
+++ b/resources/assets/js/components/dashboard/ReportIncident.js
@@ -0,0 +1,43 @@
+module.exports = {
+    data () {
+        return {
+            template: null,
+            name: '',
+            status: null,
+            visible: 1,
+            sticky: 0,
+            message: '',
+            when: null,
+            notify: false,
+            component: {
+                id: null,
+                status: null
+            }
+        }
+    },
+    methods: {
+        getTemplate (template) {
+            axios.get('/dashboard/api/incidents/templates', {
+                params: {
+                    slug: template
+                }
+            }).then(response => {
+                this.name = response.data.name
+                this.message = response.data.template
+            }).catch(response => {
+                (new Cachet.Notifier()).notify('There was an error finding that template.');
+            })
+        }
+    },
+    watch: {
+        'template' (template) {
+            this.getTemplate(template)
+        },
+        'component.id' (id) {
+            // If we unselect a component then reset the status.
+            if (id === '') {
+                this.component.status = null
+            }
+        }
+    }
+}
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index c800d80f..b057b053 100644
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -215,7 +215,7 @@ return [
         ],
         'team' => [
             'description' => 'Invite your team members by entering their email addresses here.',
-            'email'       => 'Email #:id',
+            'email'       => 'Your Team Members Email Address',
         ],
     ],
 
diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index 5e41a04c..f91c1a39 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -14,122 +14,124 @@
     <div class="row">
         <div class="col-md-12">
             @include('dashboard.partials.errors')
-            <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
-                <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                <fieldset>
-                    @if($incident_templates->count() > 0)
-                    <div class="form-group">
-                        <label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
-                        <select class="form-control" name="template">
-                            <option selected></option>
-                            @foreach($incident_templates as $tpl)
-                            <option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
-                            @endforeach
-                        </select>
-                    </div>
-                    @endif
-                    <div class="form-group">
-                        <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                        <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('name') }}" placeholder="{{ trans('forms.incidents.name') }}">
-                    </div>
-                    <div class="form-group">
-                        <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
-                        <label class="radio-inline">
-                            <input type="radio" name="status" value="1">
-                            <i class="ion ion-flag"></i>
-                            {{ trans('cachet.incidents.status')[1] }}
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="status" value="2">
-                            <i class="ion ion-alert-circled"></i>
-                            {{ trans('cachet.incidents.status')[2] }}
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="status" value="3">
-                            <i class="ion ion-eye"></i>
-                            {{ trans('cachet.incidents.status')[3] }}
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="status" value="4">
-                            <i class="ion ion-checkmark"></i>
-                            {{ trans('cachet.incidents.status')[4] }}
-                        </label>
-                    </div>
-                    <div class="form-group">
-                        <label for="incident-name">{{ trans('forms.incidents.visibility') }}</label>
-                        <select name="visible" class="form-control">
-                            <option value="1" selected>{{ trans('forms.incidents.public') }}</option>
-                            <option value="0">{{ trans('forms.incidents.logged_in_only') }}</option>
-                        </select>
-                    </div>
-                    <div class="form-group">
-                        <label for="incident-name">{{ trans('forms.incidents.stick_status') }}</label>
-                        <select name="stickied" class="form-control">
-                            <option value="1">{{ trans('forms.incidents.stickied') }}</option>
-                            <option value="0" selected>{{ trans('forms.incidents.not_stickied') }}</option>
-                        </select>
-                    </div>
-                    @if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty())
-                    <div class="form-group">
-                        <label>{{ trans('forms.incidents.component') }}</label>
-                        <select name="component_id" class="form-control">
-                            <option value="" selected></option>
-                            @foreach($components_in_groups as $group)
-                            <optgroup label="{{ $group->name }}">
-                                @foreach($group->components as $component)
+            <report-incident inline-template>
+                <form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                    <fieldset>
+                        @if($incident_templates->count() > 0)
+                        <div class="form-group">
+                            <label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
+                            <select class="form-control" name="template" v-model="template">
+                                <option selected></option>
+                                @foreach($incident_templates as $tpl)
+                                <option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                        @endif
+                        <div class="form-group">
+                            <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
+                            <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('name') }}" placeholder="{{ trans('forms.incidents.name') }}" v-model="name">
+                        </div>
+                        <div class="form-group">
+                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
+                            <label class="radio-inline">
+                                <input type="radio" name="status" value="1" v-model="status">
+                                <i class="ion ion-flag"></i>
+                                {{ trans('cachet.incidents.status')[1] }}
+                            </label>
+                            <label class="radio-inline">
+                                <input type="radio" name="status" value="2" v-model="status">
+                                <i class="ion ion-alert-circled"></i>
+                                {{ trans('cachet.incidents.status')[2] }}
+                            </label>
+                            <label class="radio-inline">
+                                <input type="radio" name="status" value="3" v-model="status">
+                                <i class="ion ion-eye"></i>
+                                {{ trans('cachet.incidents.status')[3] }}
+                            </label>
+                            <label class="radio-inline">
+                                <input type="radio" name="status" value="4" v-model="status">
+                                <i class="ion ion-checkmark"></i>
+                                {{ trans('cachet.incidents.status')[4] }}
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <label for="incident-name">{{ trans('forms.incidents.visibility') }}</label>
+                            <select name="visible" class="form-control" v-model="visible">
+                                <option value="1" selected>{{ trans('forms.incidents.public') }}</option>
+                                <option value="0">{{ trans('forms.incidents.logged_in_only') }}</option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label for="incident-name">{{ trans('forms.incidents.stick_status') }}</label>
+                            <select name="stickied" class="form-control" v-model="sticky">
+                                <option value="1">{{ trans('forms.incidents.stickied') }}</option>
+                                <option value="0" selected>{{ trans('forms.incidents.not_stickied') }}</option>
+                            </select>
+                        </div>
+                        @if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty())
+                        <div class="form-group">
+                            <label>{{ trans('forms.incidents.component') }}</label>
+                            <select name="component_id" class="form-control" v-model="component.id">
+                                <option value="" selected></option>
+                                @foreach($components_in_groups as $group)
+                                <optgroup label="{{ $group->name }}">
+                                    @foreach($group->components as $component)
+                                    <option value="{{ $component->id }}">{{ $component->name }}</option>
+                                    @endforeach
+                                </optgroup>
+                                @endforeach
+                                @foreach($components_out_groups as $component)
                                 <option value="{{ $component->id }}">{{ $component->name }}</option>
                                 @endforeach
-                            </optgroup>
-                            @endforeach
-                            @foreach($components_out_groups as $component)
-                            <option value="{{ $component->id }}">{{ $component->name }}</option>
-                            @endforeach
-                        </select>
-                        <span class='help-block'>{{ trans('forms.optional') }}</span>
-                    </div>
-                    @endif
-                    <div class="form-group hidden" id="component-status">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
-                                <div class="radio-items">
-                                    @foreach(trans('cachet.components.status') as $statusID => $status)
-                                    <div class="radio-inline">
-                                        <label>
-                                            <input type="radio" name="component_status" value="{{ $statusID }}">
-                                            {{ $status }}
-                                        </label>
+                            </select>
+                            <span class='help-block'>{{ trans('forms.optional') }}</span>
+                        </div>
+                        @endif
+                        <div class="form-group hidden" id="component-status" v-if="component.id">
+                            <div class="panel panel-default">
+                                <div class="panel-body">
+                                    <div class="radio-items">
+                                        @foreach(trans('cachet.components.status') as $statusID => $status)
+                                        <div class="radio-inline">
+                                            <label>
+                                                <input type="radio" name="component_status" value="{{ $statusID }}" v-model="component.status">
+                                                {{ $status }}
+                                            </label>
+                                        </div>
+                                        @endforeach
                                     </div>
-                                    @endforeach
                                 </div>
                             </div>
                         </div>
-                    </div>
+                        <div class="form-group">
+                            <label>{{ trans('forms.incidents.message') }}</label>
+                            <div class="markdown-control">
+                                <textarea name="message" class="form-control autosize" rows="5" required v-model="message">{{ Binput::old('message') }}</textarea>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans('forms.incidents.occurred_at') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
+                            <input type="text" name="occurred_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" placeholder="{{ trans('forms.optional') }}">
+                        </div>
+                        <input type="hidden" name="notify" value="0">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="notify" value="1" checked="{{ Binput::old('notify', 'checked') }}">
+                                {{ trans('forms.incidents.notify_subscribers') }}
+                            </label>
+                        </div>
+                    </fieldset>
+
                     <div class="form-group">
-                        <label>{{ trans('forms.incidents.message') }}</label>
-                        <div class="markdown-control">
-                            <textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
+                        <div class="btn-group">
+                            <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
+                            <a class="btn btn-default" href="{{ cachet_route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.incidents.occurred_at') }}</label> <small class="text-muted">{{ trans('forms.optional') }}</small>
-                        <input type="text" name="occurred_at" class="form-control" rel="datepicker-custom" data-date-format="YYYY-MM-DD HH:mm" placeholder="{{ trans('forms.optional') }}">
-                    </div>
-                    <input type="hidden" name="notify" value="0">
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" name="notify" value="1" checked="{{ Binput::old('notify', 'checked') }}">
-                            {{ trans('forms.incidents.notify_subscribers') }}
-                        </label>
-                    </div>
-                </fieldset>
-
-                <div class="form-group">
-                    <div class="btn-group">
-                        <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
-                        <a class="btn btn-default" href="{{ cachet_route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
-                    </div>
-                </div>
-            </form>
+                </form>
+            </report-incident>
         </div>
     </div>
 </div>
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index 4822d57d..06d7c4e1 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -1,92 +1,95 @@
 @extends('layout.dashboard')
 
 @section('content')
-<div class="header">
-    <div class="sidebar-toggler visible-xs">
-        <i class="ion ion-navicon"></i>
-    </div>
-    <span class="uppercase">
-        <i class="ion ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
-    </span>
-</div>
-<div class="content-wrapper">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="alert alert-info hidden" id="update-alert">{!! trans('cachet.system.update') !!}</div>
+<dashboard inline-template :welcome-user="{{ $welcome_user ? 'true' : 'false' }}">
+    <div>
+        <div class="header">
+            <div class="sidebar-toggler visible-xs">
+                <i class="ion ion-navicon"></i>
+            </div>
+            <span class="uppercase">
+                <i class="ion ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
+            </span>
         </div>
-    </div>
-
-    <div class="row">
-      <div class="col-md-12">
-          <div class="section-components no-select">
-              @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
-              @include('dashboard.partials.components')
-              @else
-              <ul class="list-group components">
-                  <li class="list-group-item">
-                      <a href="{{ cachet_route('dashboard.components.create') }}">{{ trans('dashboard.components.add.message') }}</a>
-                  </li>
-              </ul>
-              @endif
-          </div>
-      </div>
-    </div>
-
-    <div class="row">
-        <div class="col-sm-12 col-lg-6">
-            <div class="stats-widget">
-                <div class="stats-top">
-                    <span class="stats-value"><a href="{{ cachet_route('dashboard.incidents') }}">{{ $incidents->reduce(function($carry, $incident) { return $carry + count($incident); }) }}</a></span>
-                    <span class="stats-label">{{ trans('dashboard.incidents.incidents') }}</span>
-                </div>
-                <div class="stats-chart">
-                    <div class="sparkline" data-type="line" data-resize="true" data-height="80" data-width="100%" data-line-width="2" data-min-spot-color="#e65100" data-max-spot-color="#ffb300" data-line-color="#3498db" data-spot-color="#00838f" data-fill-color="#3498db" data-highlight-line-color="#00acc1" data-highlight-spot-color="#ff8a65" data-spot-radius="false" data-data="[{{ $incidents->map(function ($incident) { return count($incident); } )->implode(',') }}]"></div>
+        <div class="content-wrapper">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="alert alert-info hidden" id="update-alert">{!! trans('cachet.system.update') !!}</div>
                 </div>
             </div>
-        </div>
 
-        <div class="col-sm-12 col-lg-6">
-            <div class="stats-widget">
-                <div class="stats-top">
-                    <span class="stats-value"><a href="{{ cachet_route('dashboard.subscribers') }}">{{ $subscribers->reduce(function($carry, $subscribers) { return $carry + count($subscribers); }) }}</a></span>
-                    <span class="stats-label">{{ trans('dashboard.subscribers.subscribers') }}</span>
-                </div>
-                <div class="stats-chart">
-                    <div class="sparkline" data-type="line" data-resize="true" data-height="80" data-width="100%" data-line-width="2" data-min-spot-color="#e65100" data-max-spot-color="#ffb300" data-line-color="#3498db" data-spot-color="#00838f" data-fill-color="#3498db" data-highlight-line-color="#00acc1" data-highlight-spot-color="#ff8a65" data-spot-radius="false" data-data="[{{ $subscribers->map(function ($subscriber) { return count($subscriber); } )->implode(',') }}]"></div>
-                </div>
+            <div class="row">
+              <div class="col-md-12">
+                  <div class="section-components no-select">
+                      @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
+                      @include('dashboard.partials.components')
+                      @else
+                      <ul class="list-group components">
+                          <li class="list-group-item">
+                              <a href="{{ cachet_route('dashboard.components.create') }}">{{ trans('dashboard.components.add.message') }}</a>
+                          </li>
+                      </ul>
+                      @endif
+                  </div>
+              </div>
             </div>
-        </div>
-    </div>
 
-    <div class="row">
-        <div class="col-sm-12 col-lg-6">
-            <div class="stats-widget">
-                <div class="stats-top">
-                    <span class="stats-value">{{ trans('dashboard.widgets.support') }}</span>
-                    <span class="stats-label">{!! trans('dashboard.widgets.support_subtitle') !!}</span>
+            <div class="row">
+                <div class="col-sm-12 col-lg-6">
+                    <div class="stats-widget">
+                        <div class="stats-top">
+                            <span class="stats-value"><a href="{{ cachet_route('dashboard.incidents') }}">{{ $incidents->reduce(function($carry, $incident) { return $carry + count($incident); }) }}</a></span>
+                            <span class="stats-label">{{ trans('dashboard.incidents.incidents') }}</span>
+                        </div>
+                        <div class="stats-chart">
+                            <div class="sparkline" data-type="line" data-resize="true" data-height="80" data-width="100%" data-line-width="2" data-min-spot-color="#e65100" data-max-spot-color="#ffb300" data-line-color="#3498db" data-spot-color="#00838f" data-fill-color="#3498db" data-highlight-line-color="#00acc1" data-highlight-spot-color="#ff8a65" data-spot-radius="false" data-data="[{{ $incidents->map(function ($incident) { return count($incident); } )->implode(',') }}]"></div>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
 
-        @if($entries)
-        <div class="col-sm-12 col-lg-6">
-            <div class="stats-widget">
-                <div class='stats-top'>
-                    <span class='stats-value'>{{ trans('dashboard.widgets.news') }}</span>
-                    <span class='stats-label'>{{ trans('dashboard.widgets.news_subtitle') }}</span>
-                </div>
-                <div class='stats-body'>
-                    <div class="list-group">
-                        @foreach($entries as $entry)
-                        <a class="list-group-item" href="{{ $entry->link }}" target="_blank">{{ $entry->title }}, <small>{{ $entry->pubDate }}</small> <span class="badge"><i class="ion-android-open"></i></span></a>
-                        @endforeach
+                <div class="col-sm-12 col-lg-6">
+                    <div class="stats-widget">
+                        <div class="stats-top">
+                            <span class="stats-value"><a href="{{ cachet_route('dashboard.subscribers') }}">{{ $subscribers->reduce(function($carry, $subscribers) { return $carry + count($subscribers); }) }}</a></span>
+                            <span class="stats-label">{{ trans('dashboard.subscribers.subscribers') }}</span>
+                        </div>
+                        <div class="stats-chart">
+                            <div class="sparkline" data-type="line" data-resize="true" data-height="80" data-width="100%" data-line-width="2" data-min-spot-color="#e65100" data-max-spot-color="#ffb300" data-line-color="#3498db" data-spot-color="#00838f" data-fill-color="#3498db" data-highlight-line-color="#00acc1" data-highlight-spot-color="#ff8a65" data-spot-radius="false" data-data="[{{ $subscribers->map(function ($subscriber) { return count($subscriber); } )->implode(',') }}]"></div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        @endif
-    </div>
-</div>
 
-@includeWhen($welcome_user, 'dashboard.partials.welcome-modal')
+            <div class="row">
+                <div class="col-sm-12 col-lg-6">
+                    <div class="stats-widget">
+                        <div class="stats-top">
+                            <span class="stats-value">{{ trans('dashboard.widgets.support') }}</span>
+                            <span class="stats-label">{!! trans('dashboard.widgets.support_subtitle') !!}</span>
+                        </div>
+                    </div>
+                </div>
+
+                @if($entries)
+                <div class="col-sm-12 col-lg-6">
+                    <div class="stats-widget">
+                        <div class='stats-top'>
+                            <span class='stats-value'>{{ trans('dashboard.widgets.news') }}</span>
+                            <span class='stats-label'>{{ trans('dashboard.widgets.news_subtitle') }}</span>
+                        </div>
+                        <div class='stats-body'>
+                            <div class="list-group">
+                                @foreach($entries as $entry)
+                                <a class="list-group-item" href="{{ $entry->link }}" target="_blank">{{ $entry->title }}, <small>{{ $entry->pubDate }}</small> <span class="badge"><i class="ion-android-open"></i></span></a>
+                                @endforeach
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                @endif
+            </div>
+        </div>
+        @includeWhen($welcome_user, 'dashboard.partials.welcome-modal')
+    </div>
+</dashboard>
 @stop
diff --git a/resources/views/dashboard/partials/welcome-modal.blade.php b/resources/views/dashboard/partials/welcome-modal.blade.php
index 33094069..90f252a5 100644
--- a/resources/views/dashboard/partials/welcome-modal.blade.php
+++ b/resources/views/dashboard/partials/welcome-modal.blade.php
@@ -64,9 +64,3 @@
         </div>
     </div>
 </div>
-
-<script>
-(function() {
-    $('#welcome-modal').modal('show');
-}());
-</script>
diff --git a/resources/views/dashboard/team/invite.blade.php b/resources/views/dashboard/team/invite.blade.php
index 202889d9..d63f7378 100644
--- a/resources/views/dashboard/team/invite.blade.php
+++ b/resources/views/dashboard/team/invite.blade.php
@@ -10,38 +10,36 @@
     </span>
 </div>
 <div class="content-wrapper">
-    <div class="row">
-        <div class="col-sm-12">
-            @include('dashboard.partials.errors')
-            <form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.team.invite', [], 'post') }}" method="POST">
-                <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                <fieldset>
-                    <div class="form-group">
-                        <label>{{ trans('forms.user.team.description') }}</label>
-                        <input type="email" class="form-control" name="emails[]" value="{{ Binput::old('emails')[0] }}" placeholder="{{ trans('forms.user.team.email', ['id' => 1]) }}" required>
-                    </div>
-                    <div class="form-group">
-                        <input type="email" class="form-control" name="emails[]" value="{{ Binput::old('emails')[1] }}" placeholder="{{ trans('forms.user.team.email', ['id' => 2]) }}">
-                    </div>
-                    <div class="form-group">
-                        <input type="email" class="form-control" name="emails[]" value="{{ Binput::old('emails')[2] }}" placeholder="{{ trans('forms.user.team.email', ['id' => 3]) }}">
-                    </div>
-                    <div class="form-group">
-                        <input type="email" class="form-control" name="emails[]" value="{{ Binput::old('emails')[3] }}" placeholder="{{ trans('forms.user.team.email', ['id' => 4]) }}">
-                    </div>
-                    <div class="form-group">
-                        <input type="email" class="form-control" name="emails[]" value="{{ Binput::old('emails')[4] }}" placeholder="{{ trans('forms.user.team.email', ['id' => 5]) }}">
-                    </div>
-                </fieldset>
+    <invite-team inline-template>
+        <div class="row">
+            <div class="col-sm-12">
+                @include('dashboard.partials.errors')
+                <form name="UserForm" class="form-vertical" role="form" action="{{ cachet_route('dashboard.team.invite', [], 'post') }}" method="POST">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                    <fieldset>
+                        <div class="form-group">
+                            <label>{{ trans('forms.user.team.description') }}</label>
+                        </div>
+                        <div class="form-group" v-for="(email, index) in emails">
+                            <div :class="{ 'input-group': canRemove }">
+                                <input type="email" class="form-control" name="emails[]" placeholder="{{ trans('forms.user.team.email') }}" v-model="email.email">
+                                <span class="input-group-btn" v-if="canRemove">
+                                    <button type="button" @click="remove(index)" class="btn btn-danger">Remove</button>
+                                </span>
+                            </div>
+                        </div>
+                    </fieldset>
 
-                <div class="form-group">
-                    <div class="btn-group">
-                        <button type="submit" class="btn btn-success">{{ trans('forms.invite') }}</button>
-                        <a class="btn btn-default" href="{{ cachet_route('dashboard.team') }}">{{ trans('forms.cancel') }}</a>
+                    <div class="form-group">
+                        <div class="btn-group">
+                            <button type="submit" class="btn btn-success">{{ trans('forms.invite') }}</button>
+                            <a class="btn btn-default" href="{{ cachet_route('dashboard.team') }}">{{ trans('forms.cancel') }}</a>
+                            <button type="button" @click="add" class="btn btn-primary">Add</button>
+                        </div>
                     </div>
-                </div>
-            </form>
+                </form>
+            </div>
         </div>
-    </div>
+    </invite-team>
 </div>
 @stop
diff --git a/resources/views/layout/clean.blade.php b/resources/views/layout/clean.blade.php
index ab437d8b..66bf8ed5 100644
--- a/resources/views/layout/clean.blade.php
+++ b/resources/views/layout/clean.blade.php
@@ -23,7 +23,7 @@
     <title>{{ $page_title or $site_title }}</title>
 
     @if($enable_external_dependencies)
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
+    {{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css"> --}}
     @endif
     <link rel="stylesheet" href="{{ mix('dist/css/dashboard/dashboard.css') }}">
     @yield('css')
@@ -34,12 +34,16 @@
         var Global = {};
         Global.locale = '{{ $app_locale }}';
     </script>
-    <script src="{{ mix('dist/js/all.js') }}"></script>
+
+    <script src="{{ mix('dist/js/manifest.js') }}"></script>
+    <script src="{{ mix('dist/js/vendor.js') }}"></script>
 </head>
 
 <body class="@yield('bodyClass')">
-    <div class="content">
+    <div class="content" id="app">
         @yield('content')
     </div>
 </body>
+@yield('js')
+<script src="{{ mix('dist/js/all.js') }}"></script>
 </html>
diff --git a/resources/views/layout/dashboard.blade.php b/resources/views/layout/dashboard.blade.php
index e4a2a897..9438fb8d 100644
--- a/resources/views/layout/dashboard.blade.php
+++ b/resources/views/layout/dashboard.blade.php
@@ -22,6 +22,12 @@
 
     <title>{{ $page_title or $site_title }}</title>
 
+    <script>
+        window.Global = {}
+        Global.locale = '{{ $app_locale }}';
+        Global.csrfToken = '{{ csrf_token() }}';
+    </script>
+
     @if($enable_external_dependencies)
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset={{ $font_subset }}" rel="stylesheet" type="text/css">
     @endif
@@ -30,15 +36,12 @@
 
     @include('partials.crowdin')
 
-    <script type="text/javascript">
-        var Global = {};
-        Global.locale = '{{ $app_locale }}';
-    </script>
-    <script src="{{ mix('dist/js/all.js') }}"></script>
+    <script src="{{ mix('dist/js/manifest.js') }}"></script>
+    <script src="{{ mix('dist/js/vendor.js') }}"></script>
 </head>
 
 <body class="dashboard">
-    <div class="wrapper">
+    <div class="wrapper" id="app">
         @include('dashboard.partials.sidebar')
         <div class="page-content">
             @if(!$is_writeable)
@@ -56,6 +59,7 @@
             @yield('content')
         </div>
     </div>
-    @yield('js')
 </body>
+@yield('js')
+<script src="{{ mix('dist/js/all.js') }}"></script>
 </html>
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index f9f6a40e..5700e3aa 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -76,17 +76,19 @@
 
         Global.locale = '{{ $app_locale }}';
     </script>
-    <script src="{{ mix('dist/js/all.js') }}"></script>
+    <script src="{{ mix('dist/js/manifest.js') }}"></script>
+    <script src="{{ mix('dist/js/vendor.js') }}"></script>
 </head>
 <body class="status-page @yield('bodyClass')">
     @yield('outer-content')
 
     @include('partials.banner')
 
-    <div class="container">
+    <div class="container" id="app">
         @yield('content')
     </div>
 
     @yield('bottom-content')
 </body>
+<script src="{{ mix('dist/js/all.js') }}"></script>
 </html>
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index 9957e202..6d864652 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -26,213 +26,217 @@
                 <span></span>
             </div>
         </div>
+
         <div class="clearfix"></div>
-        <form class="form-horizontal" name="SetupForm" method="POST" id="setup-form" role="form">
-            <div class="step block-1">
-                <fieldset>
-                    <div class="form-group">
-                        <div class="row">
-                            <div class="col-xs-4">
-                                <label>{{ trans('forms.setup.cache_driver') }}</label>
-                                <select name="env[cache_driver]" class="form-control" required>
-                                    <option disabled>{{ trans('forms.setup.cache_driver') }}</option>
-                                    @foreach($cache_drivers as $driver => $driverName)
-                                    <option value="{{ $driver }}" {{ Binput::old('env.cache_driver', $cache_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
-                                    @endforeach
-                                </select>
-                                @if($errors->has('env.cache_driver'))
-                                <span class="text-danger">{{ $errors->first('env.cache_driver') }}</span>
-                                @endif
-                            </div>
-                            <div class="col-xs-4">
-                                <label>{{ trans('forms.setup.queue_driver') }}</label>
-                                <select name="env[queue_driver]" class="form-control" required>
-                                    <option disabled>{{ trans('forms.setup.queue_driver') }}</option>
-                                    @foreach($queue_drivers as $driver => $driverName)
-                                    <option value="{{ $driver }}" {{ Binput::old('env.queue_driver', $queue_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
-                                    @endforeach
-                                </select>
-                                @if($errors->has('env.queue_driver'))
-                                <span class="text-danger">{{ $errors->first('env.queue_driver') }}</span>
-                                @endif
-                            </div>
-                            <div class="col-xs-4">
-                                <label>{{ trans('forms.setup.session_driver') }}</label>
-                                <select name="env[session_driver]" class="form-control" required>
-                                    <option disabled>{{ trans('forms.setup.session_driver') }}</option>
-                                    @foreach($cache_drivers as $driver => $driverName)
-                                    <option value="{{ $driver }}" {{ Binput::old('env.session_driver', $session_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
-                                    @endforeach
-                                </select>
-                                @if($errors->has('env.session_driver'))
-                                <span class="text-danger">{{ $errors->first('env.session_driver') }}</span>
-                                @endif
+
+        <setup inline-template>
+            <form class="form-horizontal" name="SetupForm" method="POST" id="setup-form" role="form">
+                <div class="step block-1">
+                    <fieldset>
+                        <div class="form-group">
+                            <div class="row">
+                                <div class="col-xs-4">
+                                    <label>{{ trans('forms.setup.cache_driver') }}</label>
+                                    <select name="env[cache_driver]" class="form-control" required v-model="env.cache_driver">
+                                        <option disabled>{{ trans('forms.setup.cache_driver') }}</option>
+                                        @foreach($cache_drivers as $driver => $driverName)
+                                        <option value="{{ $driver }}" {{ Binput::old('env.cache_driver', $cache_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                                        @endforeach
+                                    </select>
+                                    @if($errors->has('env.cache_driver'))
+                                    <span class="text-danger">{{ $errors->first('env.cache_driver') }}</span>
+                                    @endif
+                                </div>
+                                <div class="col-xs-4">
+                                    <label>{{ trans('forms.setup.queue_driver') }}</label>
+                                    <select name="env[queue_driver]" class="form-control" required v-model="env.queue_driver">
+                                        <option disabled>{{ trans('forms.setup.queue_driver') }}</option>
+                                        @foreach($queue_drivers as $driver => $driverName)
+                                        <option value="{{ $driver }}" {{ Binput::old('env.queue_driver', $queue_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                                        @endforeach
+                                    </select>
+                                    @if($errors->has('env.queue_driver'))
+                                    <span class="text-danger">{{ $errors->first('env.queue_driver') }}</span>
+                                    @endif
+                                </div>
+                                <div class="col-xs-4">
+                                    <label>{{ trans('forms.setup.session_driver') }}</label>
+                                    <select name="env[session_driver]" class="form-control" required v-model="env.session_driver">
+                                        <option disabled>{{ trans('forms.setup.session_driver') }}</option>
+                                        @foreach($cache_drivers as $driver => $driverName)
+                                        <option value="{{ $driver }}" {{ Binput::old('env.session_driver', $session_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                                        @endforeach
+                                    </select>
+                                    @if($errors->has('env.session_driver'))
+                                    <span class="text-danger">{{ $errors->first('env.session_driver') }}</span>
+                                    @endif
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <hr>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.mail_driver') }}</label>
-                        <select name="env[mail_driver]" class="form-control" required>
-                            <option disabled>{{ trans('forms.setup.mail_driver') }}</option>
-                            @foreach($mail_drivers as $driver => $driverName)
-                            <option value="{{ $driver }}" {{ Binput::old('env.mail_driver', $mail_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
-                            @endforeach
-                        </select>
-                        @if($errors->has('env.mail_driver'))
-                        <span class="text-danger">{{ $errors->first('env.mail_driver') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.mail_host') }} (optional)</label>
-                        <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}">
-                        @if($errors->has('env.mail_host'))
-                        <span class="text-danger">{{ $errors->first('env.mail_host') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.mail_address') }}</label>
-                        <input type="text" class="form-control" name="env[mail_address]" value="{{ Binput::old('env.mail_address', $mail_config['from']['address']) }}" placeholder="notifications@alt-three.com">
-                        @if($errors->has('env.mail_address'))
-                        <span class="text-danger">{{ $errors->first('env.mail_address') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.mail_username') }}</label>
-                        <input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mail_config['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}">
-                        @if($errors->has('env.mail_username'))
-                        <span class="text-danger">{{ $errors->first('env.mail_username') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.mail_password') }}</label>
-                        <input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}">
-                        @if($errors->has('env.mail_password'))
-                        <span class="text-danger">{{ $errors->first('env.mail_password') }}</span>
-                        @endif
-                    </div>
-                </fieldset>
-                <hr>
-                <div class="form-group text-center">
-                    <span class="wizard-next btn btn-success" data-current-block="1" data-next-block="2" data-loading-text="<i class='icon ion-load-c'></i>">
-                        {{ trans('pagination.next') }}
-                    </span>
-                </div>
-            </div>
-            <div class="step block-2 hidden">
-                <fieldset>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.site_name') }}</label>
-                        <input type="text" name="settings[app_name]" class="form-control" placeholder="{{ trans('forms.setup.site_name') }}" value="{{ Binput::old('settings.app_name', '') }}" required>
-                        @if($errors->has('settings.app_name'))
-                        <span class="text-danger">{{ $errors->first('settings.app_name') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.site_domain') }}</label>
-                        <input type="text" name="settings[app_domain]" class="form-control" placeholder="{{ trans('forms.setup.site_domain') }}" value="{{ Binput::old('settings.app_domain', url('/')) }}" required>
-                        @if($errors->has('settings.app_domain'))
-                        <span class="text-danger">{{ $errors->first('settings.app_domain') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.site_timezone') }}</label>
-                        <select name="settings[app_timezone]" class="form-control" required>
-                            <option value="">{{ trans('forms.general.timezone') }}</option>
-                            @foreach($timezones as $region => $list)
-                            <optgroup label="{{ $region }}">
-                            @foreach($list as $timezone => $name)
-                            <option value="{{ $timezone }}" @if(Binput::old('settings.app_timezone') == $timezone) selected @endif>
-                                {{ $name }}
-                            </option>
-                            @endforeach
-                            </optgroup>
-                            @endforeach
-                        </select>
-                        @if($errors->has('settings.app_timezone'))
-                        <span class="text-danger">{{ $errors->first('settings.app_timezone') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.setup.site_locale') }}</label>
-                        <select name="settings[app_locale]" class="form-control" required>
-                            <option value="">Select Language</option>
-                            @foreach($langs as $key => $lang)
-                            <option value="{{ $key }}" @if(Binput::old('settings.app_locale') == $key || $user_language == $key) selected @endif>
-                                {{ $lang['name'] }}
-                            </option>
-                            @endforeach
-                        </select>
-                        @if($errors->has('settings.app_locale'))
-                        <span class="text-danger">{{ $errors->first('settings.app_locale') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>
-                            <input type="checkbox" name="settings[show_support]" value="1" checked>
-                            {{ trans("setup.show_support") }}
-                        </label>
-                    </div>
+                        <hr>
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.mail_driver') }}</label>
+                            <select name="env[mail_driver]" class="form-control" required v-model="env.mail_driver">
+                                <option disabled>{{ trans('forms.setup.mail_driver') }}</option>
+                                @foreach($mail_drivers as $driver => $driverName)
+                                <option value="{{ $driver }}" {{ Binput::old('env.mail_driver', $mail_config['driver']) == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                                @endforeach
+                            </select>
+                            @if($errors->has('env.mail_driver'))
+                            <span class="text-danger">{{ $errors->first('env.mail_driver') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group" v-if="mail.requiresHost">
+                            <label>{{ trans('forms.setup.mail_host') }} (optional)</label>
+                            <input type="text" class="form-control" name="env[mail_host]" value="{{ Binput::old('env.mail_host', $mail_config['host']) }}" placeholder="{{ trans('forms.setup.mail_host') }}">
+                            @if($errors->has('env.mail_host'))
+                            <span class="text-danger">{{ $errors->first('env.mail_host') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.mail_address') }}</label>
+                            <input type="text" class="form-control" name="env[mail_address]" value="{{ Binput::old('env.mail_address', $mail_config['from']['address']) }}" placeholder="notifications@alt-three.com">
+                            @if($errors->has('env.mail_address'))
+                            <span class="text-danger">{{ $errors->first('env.mail_address') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group" v-if="mail.requiresUsername">
+                            <label>{{ trans('forms.setup.mail_username') }}</label>
+                            <input type="text" class="form-control" name="env[mail_username]" value="{{ Binput::old('env.mail_username', $mail_config['username']) }}" placeholder="{{ trans('forms.setup.mail_username') }}">
+                            @if($errors->has('env.mail_username'))
+                            <span class="text-danger">{{ $errors->first('env.mail_username') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group" v-if="mail.requiresPassword">
+                            <label>{{ trans('forms.setup.mail_password') }}</label>
+                            <input type="password" class="form-control" name="env[mail_password]" value="{{ Binput::old('env.mail_password', $mail_config['password']) }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}">
+                            @if($errors->has('env.mail_password'))
+                            <span class="text-danger">{{ $errors->first('env.mail_password') }}</span>
+                            @endif
+                        </div>
+                    </fieldset>
                     <hr>
                     <div class="form-group text-center">
-                        <span class="wizard-next btn btn-info" data-current-block="2" data-next-block="1">
-                            {{ trans('pagination.previous') }}
-                        </span>
-                        <span class="wizard-next btn btn-success" data-current-block="2" data-next-block="3" data-loading-text="<i class='icon ion-load-c'></i>">
+                        <span class="wizard-next btn btn-success" data-current-block="1" data-next-block="2" data-loading-text="<i class='icon ion-load-c'></i>">
                             {{ trans('pagination.next') }}
                         </span>
                     </div>
-                </fieldset>
-            </div>
-            <div class="step block-3 hidden">
-                <fieldset>
-                    <div class="form-group">
-                        <label>{{ trans("forms.setup.username") }}</label>
-                        <input type="text" name="user[username]" class="form-control" placeholder="{{ trans('forms.setup.username') }}" value="{{ Binput::old('user.username', '') }}" required>
-                        @if($errors->has('user.username'))
-                        <span class="text-danger">{{ $errors->first('user.username') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans("forms.setup.email") }}</label>
-                        <input type="text" name="user[email]" class="form-control" placeholder="{{ trans('forms.setup.email') }}" value="{{ Binput::old('user.email', '') }}" required>
-                        @if($errors->has('user.email'))
-                        <span class="text-danger">{{ $errors->first('user.email') }}</span>
-                        @endif
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans("forms.setup.password") }}</label>
-                        <input type="password" name="user[password]" class="form-control password-strength" placeholder="{{ trans('forms.setup.password') }}" value="{{ Binput::old('user.password', '') }}" required>
-                        <div class="strengthify-wrapper"></div>
-                        @if($errors->has('user.password'))
-                        <span class="text-danger">{{ $errors->first('user.password') }}</span>
-                        @endif
-                    </div>
-                </fieldset>
-                <hr >
-                <div class="form-group text-center">
-                    <input type="hidden" name="settings[app_incident_days]" value="7" >
-                    <input type="hidden" name="settings[app_refresh_rate]" value="0" >
-                    <span class="wizard-next btn btn-info" data-current-block="3" data-next-block="2">
-                        {{ trans('pagination.previous') }}
-                    </span>
-                    <span class="wizard-next btn btn-success" data-current-block="3" data-next-block="4" data-loading-text="<i class='icon ion-load-c'></i>">
-                        {{ trans("setup.complete_setup") }}
-                    </span>
                 </div>
-            </div>
-            <div class="step block-4 hidden">
-                <div class="setup-success">
-                    <i class="ion ion-checkmark-circled"></i>
-                    <h3>
-                        {{ trans("setup.completed") }}
-                    </h3>
-                    <a href="{{ cachet_route('dashboard') }}" class="btn btn-default">
-                        <span>{{ trans("setup.finish_setup") }}</span>
-                    </a>
+                <div class="step block-2 hidden">
+                    <fieldset>
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.site_name') }}</label>
+                            <input type="text" name="settings[app_name]" class="form-control" placeholder="{{ trans('forms.setup.site_name') }}" value="{{ Binput::old('settings.app_name', '') }}" required>
+                            @if($errors->has('settings.app_name'))
+                            <span class="text-danger">{{ $errors->first('settings.app_name') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.site_domain') }}</label>
+                            <input type="text" name="settings[app_domain]" class="form-control" placeholder="{{ trans('forms.setup.site_domain') }}" value="{{ Binput::old('settings.app_domain', url('/')) }}" required>
+                            @if($errors->has('settings.app_domain'))
+                            <span class="text-danger">{{ $errors->first('settings.app_domain') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.site_timezone') }}</label>
+                            <select name="settings[app_timezone]" class="form-control" required>
+                                <option value="">{{ trans('forms.general.timezone') }}</option>
+                                @foreach($timezones as $region => $list)
+                                <optgroup label="{{ $region }}">
+                                @foreach($list as $timezone => $name)
+                                <option value="{{ $timezone }}" @if(Binput::old('settings.app_timezone') == $timezone) selected @endif>
+                                    {{ $name }}
+                                </option>
+                                @endforeach
+                                </optgroup>
+                                @endforeach
+                            </select>
+                            @if($errors->has('settings.app_timezone'))
+                            <span class="text-danger">{{ $errors->first('settings.app_timezone') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans('forms.setup.site_locale') }}</label>
+                            <select name="settings[app_locale]" class="form-control" required>
+                                <option value="">Select Language</option>
+                                @foreach($langs as $key => $lang)
+                                <option value="{{ $key }}" @if(Binput::old('settings.app_locale') == $key || $user_language == $key) selected @endif>
+                                    {{ $lang['name'] }}
+                                </option>
+                                @endforeach
+                            </select>
+                            @if($errors->has('settings.app_locale'))
+                            <span class="text-danger">{{ $errors->first('settings.app_locale') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>
+                                <input type="checkbox" name="settings[show_support]" value="1" checked>
+                                {{ trans("setup.show_support") }}
+                            </label>
+                        </div>
+                        <hr>
+                        <div class="form-group text-center">
+                            <span class="wizard-next btn btn-info" data-current-block="2" data-next-block="1">
+                                {{ trans('pagination.previous') }}
+                            </span>
+                            <span class="wizard-next btn btn-success" data-current-block="2" data-next-block="3" data-loading-text="<i class='icon ion-load-c'></i>">
+                                {{ trans('pagination.next') }}
+                            </span>
+                        </div>
+                    </fieldset>
                 </div>
-            </div>
-        </form>
+                <div class="step block-3 hidden">
+                    <fieldset>
+                        <div class="form-group">
+                            <label>{{ trans("forms.setup.username") }}</label>
+                            <input type="text" name="user[username]" class="form-control" placeholder="{{ trans('forms.setup.username') }}" value="{{ Binput::old('user.username', '') }}" required>
+                            @if($errors->has('user.username'))
+                            <span class="text-danger">{{ $errors->first('user.username') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans("forms.setup.email") }}</label>
+                            <input type="text" name="user[email]" class="form-control" placeholder="{{ trans('forms.setup.email') }}" value="{{ Binput::old('user.email', '') }}" required>
+                            @if($errors->has('user.email'))
+                            <span class="text-danger">{{ $errors->first('user.email') }}</span>
+                            @endif
+                        </div>
+                        <div class="form-group">
+                            <label>{{ trans("forms.setup.password") }}</label>
+                            <input type="password" name="user[password]" class="form-control password-strength" placeholder="{{ trans('forms.setup.password') }}" value="{{ Binput::old('user.password', '') }}" required>
+                            <div class="strengthify-wrapper"></div>
+                            @if($errors->has('user.password'))
+                            <span class="text-danger">{{ $errors->first('user.password') }}</span>
+                            @endif
+                        </div>
+                    </fieldset>
+                    <hr >
+                    <div class="form-group text-center">
+                        <input type="hidden" name="settings[app_incident_days]" value="7" >
+                        <input type="hidden" name="settings[app_refresh_rate]" value="0" >
+                        <span class="wizard-next btn btn-info" data-current-block="3" data-next-block="2">
+                            {{ trans('pagination.previous') }}
+                        </span>
+                        <span class="wizard-next btn btn-success" data-current-block="3" data-next-block="4" data-loading-text="<i class='icon ion-load-c'></i>">
+                            {{ trans("setup.complete_setup") }}
+                        </span>
+                    </div>
+                </div>
+                <div class="step block-4 hidden">
+                    <div class="setup-success">
+                        <i class="ion ion-checkmark-circled"></i>
+                        <h3>
+                            {{ trans("setup.completed") }}
+                        </h3>
+                        <a href="{{ cachet_route('dashboard') }}" class="btn btn-default">
+                            <span>{{ trans("setup.finish_setup") }}</span>
+                        </a>
+                    </div>
+                </div>
+            </form>
+        </setup>
     </div>
 </div>
 @stop