diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php
index a55d7482..48fe0ada 100644
--- a/app/views/auth/login.blade.php
+++ b/app/views/auth/login.blade.php
@@ -4,7 +4,7 @@
     <div class="login">
         <div class="col-xs-12 col-xs-offset-0 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4 text-center">
             <div class="welcome-logo">
-                <img class="logo" height="50" src="/img/cachet-logo.svg" alt="Cachet"/>
+                <img class="logo" height="50" src="/img/cachet-logo.svg" alt="Cachet">
             </div>
             {{ Form::open(['url' => '/auth/login']) }}
             <fieldset>
@@ -26,7 +26,7 @@
                         'class' => 'form-control', 'placeholder' => trans('forms.login.password'), 'required' => 'required'
                     ]) }}
                 </div>
-                <hr />
+                <hr >
                 <div class="form-group">
                     <button type="submit" class="btn btn-lg btn-block btn-success">{{ trans('dashboard.login.login') }}</button>
                 </div>
diff --git a/app/views/auth/two-factor-auth.blade.php b/app/views/auth/two-factor-auth.blade.php
index 95474428..7b59f9f7 100644
--- a/app/views/auth/two-factor-auth.blade.php
+++ b/app/views/auth/two-factor-auth.blade.php
@@ -4,7 +4,7 @@
     <div class="login">
         <div class="col-xs-12 col-xs-offset-0 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4 text-center">
             <div class="welcome-logo">
-                <img class="logo" height="50" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
+                <img class="logo" height="50" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet">
             </div>
             {{ Form::open() }}
             <fieldset>
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php
index 05dcb775..67d0c840 100644
--- a/app/views/dashboard/components/edit.blade.php
+++ b/app/views/dashboard/components/edit.blade.php
@@ -18,7 +18,7 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.components.name') }}</label>
-                            <input type="text" class="form-control" name="component[name]" id="component-name" required value="{{ $component->name }}" />
+                            <input type="text" class="form-control" name="component[name]" id="component-name" required value="{{ $component->name }}">
                         </div>
                         <div class="form-group">
                             <label for="component-status">{{ trans('forms.components.status') }}</label>
@@ -43,21 +43,21 @@
                             </select>
                         </div>
                         @endif
-                        <hr />
+                        <hr>
                         <div class="form-group">
                             <label>{{ trans('forms.components.link') }}</label>
-                            <input type="text" name="component[link]" class="form-control" value="{{ $component->link }}" />
+                            <input type="text" name="component[link]" class="form-control" value="{{ $component->link }}">
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.components.tags') }}</label>
-                            <input name="component[tags]" class="form-control" value="{{ $component->tagsList }}" />
+                            <input name="component[tags]" class="form-control" value="{{ $component->tagsList }}">
                             <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                         </div>
                     </fieldset>
 
-                    <input type="hidden" name="component[user_id]" value="{{ $component->agent_id || Auth::user()->id }}" />
-                    <input type="hidden" name="component[order]" value="{{ $component->order or 0 }}" />
-                    <input type="hidden" name="component[group_id]" value="{{ $component->group_id or 0  }}" />
+                    <input type="hidden" name="component[user_id]" value="{{ $component->agent_id || Auth::user()->id }}">
+                    <input type="hidden" name="component[order]" value="{{ $component->order or 0 }}">
+                    <input type="hidden" name="component[group_id]" value="{{ $component->group_id or 0  }}">
 
                     <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
                     <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
diff --git a/app/views/dashboard/components/groups/add.blade.php b/app/views/dashboard/components/groups/add.blade.php
index 903ffd7c..6761978e 100644
--- a/app/views/dashboard/components/groups/add.blade.php
+++ b/app/views/dashboard/components/groups/add.blade.php
@@ -18,7 +18,7 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.components.groups.name') }}</label>
-                            <input type="text" class="form-control" name="group[name]" id="group-name" required />
+                            <input type="text" class="form-control" name="group[name]" id="group-name" required>
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/components/index.blade.php b/app/views/dashboard/components/index.blade.php
index 925bde54..14bf6f28 100644
--- a/app/views/dashboard/components/index.blade.php
+++ b/app/views/dashboard/components/index.blade.php
@@ -35,7 +35,7 @@
                                 <a href="/dashboard/components/{{ $component->id }}/edit" class="btn btn-default">{{ trans('forms.edit') }}</a>
                                 <a href="/dashboard/components/{{ $component->id }}/delete" class="btn btn-danger confirm-action" data-method="DELETE">{{ trans('forms.delete') }}</a>
                             </div>
-                            <input type="hidden" rel="order" name="component[{{ $component->id }}]" value="{{ $component->order }}" />
+                            <input type="hidden" rel="order" name="component[{{ $component->id }}]" value="{{ $component->order }}">
                         </div>
                         @empty
                         <div class="list-group-item text-danger">{{ trans('dashboard.components.add.message') }}</div>
diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php
index 7d58ef14..cdd57734 100644
--- a/app/views/dashboard/incidents/add.blade.php
+++ b/app/views/dashboard/incidents/add.blade.php
@@ -27,27 +27,27 @@
                         </div>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value="{{ Input::old('incident.name') }}" />
+                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value="{{ Input::old('incident.name') }}">
                         </div>
                         <div class="form-group">
-                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br />
+                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="1" />
+                                <input type="radio" name="incident[status]" value="1">
                                 <i class="icon ion-flag"></i>
                                 {{ trans('cachet.incidents.status')[1] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="2" />
+                                <input type="radio" name="incident[status]" value="2">
                                 <i class="icon ion-alert-circled"></i>
                                 {{ trans('cachet.incidents.status')[2] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="3" />
+                                <input type="radio" name="incident[status]" value="3">
                                 <i class="icon ion-eye"></i>
                                 {{ trans('cachet.incidents.status')[3] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="4" />
+                                <input type="radio" name="incident[status]" value="4">
                                 <i class="icon ion-checkmark"></i>
                                 {{ trans('cachet.incidents.status')[4] }}
                             </label>
@@ -68,7 +68,7 @@
                                     @foreach(trans('cachet.components.status') as $statusID => $status)
                                     <div class="radio-inline">
                                         <label>
-                                            <input type="radio" name="incident[component_status]" value="{{ $statusID }}"  />
+                                            <input type="radio" name="incident[component_status]" value="{{ $statusID }}" >
                                             {{ $status }}
                                         </label>
                                     </div>
diff --git a/app/views/dashboard/incidents/edit.blade.php b/app/views/dashboard/incidents/edit.blade.php
index 5d86cc64..f9b7755f 100644
--- a/app/views/dashboard/incidents/edit.blade.php
+++ b/app/views/dashboard/incidents/edit.blade.php
@@ -18,27 +18,27 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value={{$incident->name}} />
+                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value={{$incident->name}}>
                         </div>
                         <div class="form-group">
-                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br />
+                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }} />
+                                <input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }}>
                                 <i class="icon ion-flag"></i>
                                 {{ trans('cachet.incidents.status')[1] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}/>
+                                <input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }>
                                 <i class="icon ion-alert-circled"></i>
                                 {{ trans('cachet.incidents.status')[2] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}/>
+                                <input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }>
                                 <i class="icon ion-eye"></i>
                                 {{ trans('cachet.incidents.status')[3] }}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}/>
+                                <input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }>
                                 <i class="icon ion-checkmark"></i>
                                 {{ trans('cachet.incidents.status')[4] }}
                             </label>
@@ -59,7 +59,7 @@
                                     @foreach(trans('cachet.components.status') as $statusID => $status)
                                     <div class="radio-inline">
                                         <label>
-                                            <input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component_id > 0 && $incident->component->status === $statusID ? 'checked' : null }} />
+                                            <input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component_id > 0 && $incident->component->status === $statusID ? 'checked' : null }}>
                                             {{ $status }}
                                         </label>
                                     </div>
@@ -74,8 +74,8 @@
                         </div>
                     </fieldset>
 
-                    <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" />
-                    <input type="hidden" name="incident[id]" value={{$incident->id}} />
+                    <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}">
+                    <input type="hidden" name="incident[id]" value={{$incident->id}}>
 
                     <div class='form-group'>
                         <div class='btn-group'>
diff --git a/app/views/dashboard/incidents/templates/add.blade.php b/app/views/dashboard/incidents/templates/add.blade.php
index a4640b3b..2819f117 100644
--- a/app/views/dashboard/incidents/templates/add.blade.php
+++ b/app/views/dashboard/incidents/templates/add.blade.php
@@ -18,7 +18,7 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
-                            <input type="text" class="form-control" name="template[name]" id="template-name" required />
+                            <input type="text" class="form-control" name="template[name]" id="template-name" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.templates.template') }}</label>
diff --git a/app/views/dashboard/incidents/templates/edit.blade.php b/app/views/dashboard/incidents/templates/edit.blade.php
index fbe83dc4..c8ff8c28 100644
--- a/app/views/dashboard/incidents/templates/edit.blade.php
+++ b/app/views/dashboard/incidents/templates/edit.blade.php
@@ -27,7 +27,7 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="template-name">{{ trans('forms.incidents.templates.name') }}</label>
-                            <input type="text" class="form-control" name="template[name]" id="template-name" required value="{{ $template->name }}" />
+                            <input type="text" class="form-control" name="template[name]" id="template-name" required value="{{ $template->name }}">
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.templates.template') }}</label>
diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php
index 6972101d..467c8c9f 100644
--- a/app/views/dashboard/index.blade.php
+++ b/app/views/dashboard/index.blade.php
@@ -26,14 +26,14 @@
                                     @foreach(trans('cachet.components.status') as $statusID => $status)
                                     <div class="radio-inline">
                                         <label>
-                                            <input type="radio" name="status" value="{{ $statusID }}" {{ (int) $component->status === $statusID ? 'checked' : null }} />
+                                            <input type="radio" name="status" value="{{ $statusID }}" {{ (int) $component->status === $statusID ? 'checked' : null }}>
                                             {{ $status }}
                                         </label>
                                     </div>
                                     @endforeach
                                 </div>
                             </div>
-                            <input type="hidden" name="component_id" value="{{ $component->id }}" />
+                            <input type="hidden" name="component_id" value="{{ $component->id }}">
                             {{ Form::close() }}
                         </div>
                         @empty
diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php
index 67bda59e..bae2c0d8 100644
--- a/app/views/dashboard/settings/app-setup.blade.php
+++ b/app/views/dashboard/settings/app-setup.blade.php
@@ -16,7 +16,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.site-name') }}</label>
-                                        <input type="text" class="form-control" name="app_name" value="{{ Setting::get('app_name') }}" required />
+                                        <input type="text" class="form-control" name="app_name" value="{{ Setting::get('app_name') }}" required>
                                     </div>
                                 </div>
                             </div>
@@ -24,7 +24,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.site-url') }}</label>
-                                        <input type="text" class="form-control" name="app_domain" value="{{ Setting::get('app_domain') }}" required />
+                                        <input type="text" class="form-control" name="app_domain" value="{{ Setting::get('app_domain') }}" required>
                                     </div>
                                 </div>
                             </div>
@@ -40,7 +40,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.google-analytics') }}</label>
-                                        <input type="text" name="app_analytics" class="form-control" value="{{ Setting::get('app_analytics') }}" placeholder="UA-12345-12" />
+                                        <input type="text" name="app_analytics" class="form-control" value="{{ Setting::get('app_analytics') }}" placeholder="UA-12345-12">
                                     </div>
                                 </div>
                             </div>
@@ -70,7 +70,7 @@
                                             {{ trans('forms.settings.app-setup.date-format') }}
                                             <a href="http://php.net/manual/en/function.date.php"><i class="icon ion-help-circled"></i></a>
                                         </label>
-                                        <input type="text" class="form-control" name="date_format" value="{{ Setting::get('date_format') ?: 'jS F Y' }}" />
+                                        <input type="text" class="form-control" name="date_format" value="{{ Setting::get('date_format') ?: 'jS F Y' }}">
                                     </div>
                                 </div>
                             </div>
@@ -93,7 +93,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.days-of-incidents') }}</label>
-                                        <input type="number" min="1" max="100" name="app_incident_days" class="form-control" value="{{ Setting::get('app_incident_days') ?: 7 }}" />
+                                        <input type="number" min="1" max="100" name="app_incident_days" class="form-control" value="{{ Setting::get('app_incident_days') ?: 7 }}">
                                     </div>
                                 </div>
                             </div>
@@ -101,8 +101,8 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('setup.show_support') }}</label>
-                                        <input type="hidden" value="0" name="show_support" />
-                                        <input type="checkbox" value="1" name="show_support" class="form-control" {{ Setting::get('show_support') ? 'checked' : null }} />
+                                        <input type="hidden" value="0" name="show_support">
+                                        <input type="checkbox" value="1" name="show_support" class="form-control" {{ Setting::get('show_support') ? 'checked' : null }}>
                                     </div>
                                 </div>
                             </div>
@@ -112,12 +112,12 @@
                                         <label>{{ trans('forms.settings.app-setup.banner') }}</label>
                                         @if($banner = Setting::get('app_banner'))
                                         <div id="banner-view" class="well">
-                                            <img src="data:{{ Setting::get('app_banner_type') }};base64,{{ $banner }}" style="max-width: 100%" />
-                                            <br /><br />
+                                            <img src="data:{{ Setting::get('app_banner_type') }};base64,{{ $banner }}" style="max-width: 100%">
+                                            <br><br>
                                             <button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
                                         </div>
                                         @endif
-                                        <input type="file" name="app_banner" class="form-control" />
+                                        <input type="file" name="app_banner" class="form-control">
                                         <span class="help-block">{{ trans('forms.settings.app-setup.banner-help') }}</span>
                                     </div>
                                 </div>
diff --git a/app/views/dashboard/settings/theme.blade.php b/app/views/dashboard/settings/theme.blade.php
index aafa01e0..e09e8a49 100644
--- a/app/views/dashboard/settings/theme.blade.php
+++ b/app/views/dashboard/settings/theme.blade.php
@@ -16,13 +16,13 @@
                                 <div class="col-xs-6">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.theme.background-color') }}</label>
-                                        <input type="text" class="form-control color-code" name="style.background_color" value="{{ Setting::get('style_background_color') }}" />
+                                        <input type="text" class="form-control color-code" name="style.background_color" value="{{ Setting::get('style_background_color') }}">
                                     </div>
                                 </div>
                                 <div class="col-xs-6">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.theme.text-color') }}</label>
-                                        <input type="text" class="form-control color-code" name="style.text_color" value="{{ Setting::get('style_text_color') }}" />
+                                        <input type="text" class="form-control color-code" name="style.text_color" value="{{ Setting::get('style_text_color') }}">
                                     </div>
                                 </div>
                             </div>
@@ -31,19 +31,19 @@
                                 <div class="col-xs-4">
                                     <div class="form-group">
                                         <label>Success Warning Color</label>
-                                        <input type="text" class="form-control color-code" name="style.success_warning_color" value="{{ Setting::get('style_success_warning_color') }}" />
+                                        <input type="text" class="form-control color-code" name="style.success_warning_color" value="{{ Setting::get('style_success_warning_color') }}">
                                     </div>
                                 </div>
                                 <div class="col-xs-4">
                                     <div class="form-group">
                                         <label>Error Warning Color</label>
-                                        <input type="text" class="form-control color-code" name="style.error_warning_color" value="{{ Setting::get('style_error_warning_color') }}" />
+                                        <input type="text" class="form-control color-code" name="style.error_warning_color" value="{{ Setting::get('style_error_warning_color') }}">
                                     </div>
                                 </div>
                                 <div class="col-xs-4">
                                     <div class="form-group">
                                         <label>Info Warning Color</label>
-                                        <input type="text" class="form-control color-code" name="style.style_info_warning_color" value="{{ Setting::get('style_info_warning_color') }}" />
+                                        <input type="text" class="form-control color-code" name="style.style_info_warning_color" value="{{ Setting::get('style_info_warning_color') }}">
                                     </div>
                                 </div>
                             </div>
diff --git a/app/views/dashboard/team/add.blade.php b/app/views/dashboard/team/add.blade.php
index 341ae757..f717b932 100644
--- a/app/views/dashboard/team/add.blade.php
+++ b/app/views/dashboard/team/add.blade.php
@@ -17,15 +17,15 @@
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
-                            <input type="text" class="form-control" name="username" value="{{ Input::old('username') }}" required />
+                            <input type="text" class="form-control" name="username" value="{{ Input::old('username') }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.email') }}</label>
-                            <input type="email" class="form-control" name="email" value="{{ Input::old('email') }}" required />
+                            <input type="email" class="form-control" name="email" value="{{ Input::old('email') }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.password') }}</label>
-                            <input type="password" class="form-control" name="password" value="" />
+                            <input type="password" class="form-control" name="password" value="">
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/team/edit.blade.php b/app/views/dashboard/team/edit.blade.php
index 44258682..541cdb03 100644
--- a/app/views/dashboard/team/edit.blade.php
+++ b/app/views/dashboard/team/edit.blade.php
@@ -17,15 +17,15 @@
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
-                            <input type="text" class="form-control" name="username" value="{{ $user->username }}" required />
+                            <input type="text" class="form-control" name="username" value="{{ $user->username }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.email') }}</label>
-                            <input type="email" class="form-control" name="email" value="{{ $user->email }}" required />
+                            <input type="email" class="form-control" name="email" value="{{ $user->email }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.password') }}</label>
-                            <input type="password" class="form-control" name="password" value="" {{ !Auth::user()->isAdmin ? "disabled": "" }} />
+                            <input type="password" class="form-control" name="password" value="" {{ !Auth::user()->isAdmin ? "disabled": "" }}>
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/team/index.blade.php b/app/views/dashboard/team/index.blade.php
index ba62e098..fad76115 100644
--- a/app/views/dashboard/team/index.blade.php
+++ b/app/views/dashboard/team/index.blade.php
@@ -22,7 +22,7 @@
                     @foreach($teamMembers as $member)
                     <div class="user col-sm-3 col-xs-6">
                         <a href="@if(Auth::user()->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
-                            <img src="{{ $member->gravatar }}" />
+                            <img src="{{ $member->gravatar }}">
                         </a>
                         <div class="name">{{ $member->username }}</div>
                         <div class="email">{{ $member->email }}</div>
diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php
index d18f4905..f776afdb 100644
--- a/app/views/dashboard/user/index.blade.php
+++ b/app/views/dashboard/user/index.blade.php
@@ -17,27 +17,27 @@
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
-                            <input type="text" class="form-control" name="username" value="{{ Auth::user()->username }}" required />
+                            <input type="text" class="form-control" name="username" value="{{ Auth::user()->username }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.email') }}</label>
-                            <input type="email" class="form-control" name="email" value="{{ Auth::user()->email }}" required />
+                            <input type="email" class="form-control" name="email" value="{{ Auth::user()->email }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.password') }}</label>
-                            <input type="password" class="form-control" name="password" value="" />
+                            <input type="password" class="form-control" name="password" value="">
                         </div>
-                        <hr />
+                        <hr>
                         <div class="form-group">
                             <label>{{ trans('forms.user.api-token') }}</label>
-                            <input type="text" class="form-control" name="api_key" disabled value="{{ Auth::user()->api_key }}" />
+                            <input type="text" class="form-control" name="api_key" disabled value="{{ Auth::user()->api_key }}">
                             <span class="help-block">{{ trans('forms.user.api-token-help') }}</span>
                         </div>
-                        <hr />
+                        <hr>
                         <div class="form-group">
                             <label class="checkbox-inline">
-                                <input type="hidden" name="google2fa" value="0" />
-                                <input type='checkbox' name="google2fa" value="1" {{ Auth::user()->hasTwoFactor ? "checked" : "" }} />
+                                <input type="hidden" name="google2fa" value="0">
+                                <input type='checkbox' name="google2fa" value="1" {{ Auth::user()->hasTwoFactor ? "checked" : "" }}>
                                 {{ trans('forms.setup.enable_google2fa') }}
                             </label>
                         </div>
@@ -50,7 +50,7 @@
                                 Auth::user()->google_2fa_secret
                             );
                             ?>
-                            <img src="{{ $google2fa_url }}" class="img-responsive" />
+                            <img src="{{ $google2fa_url }}" class="img-responsive">
                             <span class='help-block'>{{ trans('forms.user.2fa.help') }}</span>
                         </div>
                         @endif
diff --git a/app/views/errors/404.blade.php b/app/views/errors/404.blade.php
index cc684bcd..4b484421 100644
--- a/app/views/errors/404.blade.php
+++ b/app/views/errors/404.blade.php
@@ -3,14 +3,14 @@
 @section('content')
     <div class="middle-box text-center">
         <div>
-            <img class="logo" height="65" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
+            <img class="logo" height="65" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet">
         </div>
         <h1>{{ trans('errors.not-found.code') }}</h1>
         <h3>{{ trans('errors.not-found.title') }}</h3>
 
         <div class="error-desc">
             <p>{{ trans('errors.not-found.message') }}</p>
-            <br/>
+            <br>
             <p>
                 <a href="/" class="btn btn-default btn-lg">{{ trans('errors.not-found.link') }}</a>
             </p>
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 791b1abf..ad1a3fb7 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -5,7 +5,7 @@
     <div class="row app-banner">
         <div class="col-md-12 text-center">
             <?php $bannerType = Setting::get('app_banner_type') ?>
-            <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive" />
+            <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
         </div>
     </div>
     @endif
@@ -29,7 +29,7 @@
     @foreach($allIncidents as $incidents)
         @include('partials.incidents', $incidents)
     @endforeach
-    <hr/>
+    <hr>
 
     <nav>
         <ul class="pager">
diff --git a/app/views/partials/dashboard/sidebar.blade.php b/app/views/partials/dashboard/sidebar.blade.php
index d8b6edda..3779ce49 100644
--- a/app/views/partials/dashboard/sidebar.blade.php
+++ b/app/views/partials/dashboard/sidebar.blade.php
@@ -76,9 +76,9 @@
         </ul>
         <div class="bottom-menu-sidebar">
             <div class="text-center">
-                <img width="165" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
+                <img width="165" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet">
             </div>
-            <br/>
+            <br>
             <ul>
                 <li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.help') }}">
                     <a href="https://cachethq.io" target="_blank"><i class="icon ion-help"></i></a>
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php
index 9d2f331a..3c1ad992 100644
--- a/app/views/setup.blade.php
+++ b/app/views/setup.blade.php
@@ -3,7 +3,7 @@
 @section('content')
     <div class="setup-page">
         <div class="text-center">
-            <img class="logo" height="50" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
+            <img class="logo" height="50" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet">
             <h4>{{ trans('setup.title') }}</h4>
             <br>
         </div>
@@ -28,14 +28,14 @@
                     <fieldset>
                         <div class="form-group">
                             <label class="sr-only">{{ trans('forms.site_name') }}</label>
-                            <input type="text" name="settings[app_name]" class="form-control" placeholder="{{ trans('forms.setup.site_name') }}" value="{{ Input::old('settings.app_name', '') }}" required />
+                            <input type="text" name="settings[app_name]" class="form-control" placeholder="{{ trans('forms.setup.site_name') }}" value="{{ Input::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 class="sr-only">{{ trans('forms.site_domain') }}</label>
-                            <input type="text" name="settings[app_domain]" class="form-control" placeholder="{{ trans('forms.setup.site_domain') }}" value="{{ Input::old('settings.app_domain', url()) }}" required />
+                            <input type="text" name="settings[app_domain]" class="form-control" placeholder="{{ trans('forms.setup.site_domain') }}" value="{{ Input::old('settings.app_domain', url()) }}" required >
                             @if($errors->has('settings.app_domain'))
                             <span class="text-danger">{{ $errors->first('settings.app_domain') }}</span>
                             @endif
@@ -74,11 +74,11 @@
                         </div>
                         <div class="form-group">
                             <label>
-                                <input type="checkbox" name="settings[show_support]" value="1" checked />
+                                <input type="checkbox" name="settings[show_support]" value="1" checked >
                                 {{ trans("setup.show_support") }}
                             </label>
                         </div>
-                        <hr/>
+                        <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') }}
@@ -90,29 +90,29 @@
                     <fieldset>
                         <div class="form-group">
                             <label class="sr-only">{{ trans("forms.username") }}</label>
-                            <input type="text" name="user[username]" class="form-control" placeholder="{{ trans('forms.setup.username') }}" value="{{ Input::old('user.username', '') }}" required />
+                            <input type="text" name="user[username]" class="form-control" placeholder="{{ trans('forms.setup.username') }}" value="{{ Input::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 class="sr-only">{{ trans("forms.email") }}</label>
-                            <input type="text" name="user[email]" class="form-control" placeholder="{{ trans('forms.setup.email') }}" value="{{ Input::old('user.email', '') }}" required />
+                            <input type="text" name="user[email]" class="form-control" placeholder="{{ trans('forms.setup.email') }}" value="{{ Input::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 class="sr-only">{{ trans("forms.password") }}</label>
-                            <input type="password" name="user[password]" class="form-control" placeholder="{{ trans('forms.setup.password') }}" value="{{ Input::old('user.password', '') }}" required />
+                            <input type="password" name="user[password]" class="form-control" placeholder="{{ trans('forms.setup.password') }}" value="{{ Input::old('user.password', '') }}" required >
                             @if($errors->has('user.password'))
                             <span class="text-danger">{{ $errors->first('user.password') }}</span>
                             @endif
                         </div>
                     </fieldset>
-                    <hr />
+                    <hr >
                     <div class="form-group text-center">
-                        <input type="hidden" name="settings[app_incident_days]" value="7" />
+                        <input type="hidden" name="settings[app_incident_days]" value="7" >
                         <span class="wizard-next btn btn-info" data-current-block="2" data-next-block="1">
                             {{ trans('pagination.previous') }}
                         </span>