diff --git a/resources/views/default/_partials/navigation.blade.php b/resources/views/default/_partials/navigation.blade.php
index 8043b9100..03133d518 100644
--- a/resources/views/default/_partials/navigation.blade.php
+++ b/resources/views/default/_partials/navigation.blade.php
@@ -11,7 +11,7 @@
 		@endforeach
 
 		@foreach(AdminNavigation::getRootSection()->getSections() as $section)
-			@include('cms::navigation.sections', ['section' => $section])
+			@include(AdminTemplate::getTemplateViewPath('_partials.navigation.sections', ['section' => $section]))
 		@endforeach
 		</ul>
 	</div>
diff --git a/resources/views/default/_partials/navigation/sections.blade.php b/resources/views/default/_partials/navigation/sections.blade.php
index e48586310..1090a5f64 100644
--- a/resources/views/default/_partials/navigation/sections.blade.php
+++ b/resources/views/default/_partials/navigation/sections.blade.php
@@ -16,7 +16,7 @@
             @endforeach
 
             @foreach($section->getSections() as $sub_section )
-            @include('cms::navigation.sections', ['section' => $sub_section])
+            @include(AdminTemplate::getTemplateViewPath('_partials.navigation.sections', ['section' => $sub_section])
             @endforeach
         </ul>
     </li>
diff --git a/resources/views/default/column/action.blade.php b/resources/views/default/column/action.blade.php
index ddf6567b0..10701f441 100644
--- a/resources/views/default/column/action.blade.php
+++ b/resources/views/default/column/action.blade.php
@@ -1,4 +1,4 @@
-<td>
+<td {!! HTML::attributes($attributes) !!}>
 	<div class="text-right">
 		<a class="btn btn-default btn-sm btnAction" href="{{ $url }}" data-href="{{ $url }}" @if ($style == 'short') data-toggle="tooltip" title="{{ $value }}" @endif target="{{ $target }}">
 			@if ($icon)
diff --git a/resources/views/default/column/checkbox.blade.php b/resources/views/default/column/checkbox.blade.php
index 5ed46a99d..7bcd4f99a 100644
--- a/resources/views/default/column/checkbox.blade.php
+++ b/resources/views/default/column/checkbox.blade.php
@@ -1,5 +1,3 @@
-<td>
-	<div style="width: 30px;">
-		<input type="checkbox" class="adminCheckboxRow" value="{{ $value }}"/>
-	</div>
+<td {!! HTML::attributes($attributes) !!}>
+	<input type="checkbox" class="adminCheckboxRow" value="{{ $value }}"/>
 </td>
\ No newline at end of file
diff --git a/resources/views/default/column/control.blade.php b/resources/views/default/column/control.blade.php
index 3823d57cb..3f20bbbd8 100644
--- a/resources/views/default/column/control.blade.php
+++ b/resources/views/default/column/control.blade.php
@@ -1,13 +1,13 @@
-<td>
+<td {!! HTML::attributes($attributes) !!}>
 	<div class="text-right pull-right" style="width: 90px;">
 		@if ($editable)
-			<a href="{{ $editUrl }}" class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
+			<a href="{{ $editUrl }}" class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
 		@endif
 		@if ($deletable)
 			<form action="{{ $deleteUrl }}" method="POST" style="display:inline-block;">
 				<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 				<input type="hidden" name="_method" value="DELETE" />
-				<button class="btn btn-danger btn-sm btn-delete" data-toggle="tooltip" title="{{ trans('admin::lang.table.delete') }}">
+				<button class="btn btn-danger btn-sm btn-delete" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.delete') }}">
 					<i class="fa fa-times"></i>
 				</button>
 			</form>
@@ -15,7 +15,7 @@
 		@if ($restorable)
 			<form action="{{ $restoreUrl }}" method="POST" style="display:inline-block;">
 				<input type="hidden" name="_token" value="{{ csrf_token() }}" />
-				<button class="btn btn-primary btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.restore') }}">
+				<button class="btn btn-primary btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.restore') }}">
 					<i class="fa fa-reply"></i>
 				</button>
 			</form>
diff --git a/resources/views/default/column/count.blade.php b/resources/views/default/column/count.blade.php
index b46894853..0994e49f3 100644
--- a/resources/views/default/column/count.blade.php
+++ b/resources/views/default/column/count.blade.php
@@ -1 +1,3 @@
-<td>{{{ $value }}} {!! $append !!}</td>
\ No newline at end of file
+<td {!! HTML::attributes($attributes) !!}>
+    {{{ $value }}} {!! $append !!}
+</td>
\ No newline at end of file
diff --git a/resources/views/default/column/custom.blade.php b/resources/views/default/column/custom.blade.php
index 1a1d9be4d..df7ac9a61 100644
--- a/resources/views/default/column/custom.blade.php
+++ b/resources/views/default/column/custom.blade.php
@@ -1 +1,3 @@
-<td>{!! $value !!} {!! $append !!}</td>
\ No newline at end of file
+<td {!! HTML::attributes($attributes) !!}>
+    {!! $value !!} {!! $append !!}
+</td>
\ No newline at end of file
diff --git a/resources/views/default/column/datetime.blade.php b/resources/views/default/column/datetime.blade.php
index ce4898e10..1cd119a30 100644
--- a/resources/views/default/column/datetime.blade.php
+++ b/resources/views/default/column/datetime.blade.php
@@ -1 +1,3 @@
-<td data-order="{{ $originalValue }}">{{ $value }} {!! $append !!}</td>
\ No newline at end of file
+<td {!! HTML::attributes($attributes) !!}>
+    {{ $value }} {!! $append !!}
+</td>
\ No newline at end of file
diff --git a/resources/views/default/column/filter.blade.php b/resources/views/default/column/filter.blade.php
index 10e4e8478..e0630f065 100644
--- a/resources/views/default/column/filter.blade.php
+++ b/resources/views/default/column/filter.blade.php
@@ -1,3 +1,5 @@
 @if ( ! is_null($value))
-	<a href="{{ $url }}"><i class="fa {{ $isSelf ? 'fa-filter' : 'fa-arrow-circle-o-right' }}" data-toggle="tooltip" title="{{ $isSelf ? trans('admin::lang.table.filter') : trans('admin::lang.table.filter-goto') }}"></i></a>
-@endif
\ No newline at end of file
+	<a href="{{ $url }}" class="btn btn-link btn-outline">
+		<i class="fa {{ $icon }}" data-toggle="tooltip" title="{{ $title }}"></i>
+	</a>
+@endif
diff --git a/resources/views/default/column/header.blade.php b/resources/views/default/column/header.blade.php
index 9036a4bb8..784e93b8c 100644
--- a/resources/views/default/column/header.blade.php
+++ b/resources/views/default/column/header.blade.php
@@ -1 +1,3 @@
-<th data-orderable="{{ $orderable ? 'true' : 'false' }}">{!! $title !!}</th>
\ No newline at end of file
+<th data-orderable="{{ $orderable ? 'true' : 'false' }}" class="row-header">
+    {!! $title !!}
+</th>
diff --git a/resources/views/default/column/image.blade.php b/resources/views/default/column/image.blade.php
index 5bd865a7d..a76751b7a 100644
--- a/resources/views/default/column/image.blade.php
+++ b/resources/views/default/column/image.blade.php
@@ -1,8 +1,8 @@
-<td>
+<td {!! HTML::attributes($attributes) !!}>
 	@if ( ! empty($value))
 		<a href="{{ $value }}" data-toggle="lightbox">
 			<img class="thumbnail" src="{{ $value }}" width="80px">
 		</a>
 	@endif
 	{!! $append !!}
-</td>
\ No newline at end of file
+</td>
diff --git a/resources/views/default/column/link.blade.php b/resources/views/default/column/link.blade.php
new file mode 100644
index 000000000..fe1755e90
--- /dev/null
+++ b/resources/views/default/column/link.blade.php
@@ -0,0 +1,3 @@
+<td {!! HTML::attributes($attributes) !!}>
+    {!! link_to($link, $value, $linkAttributes) !!} {!! $append !!}
+</td>
diff --git a/resources/views/default/column/lists.blade.php b/resources/views/default/column/lists.blade.php
index 82fd4327c..86de2fce1 100644
--- a/resources/views/default/column/lists.blade.php
+++ b/resources/views/default/column/lists.blade.php
@@ -1,7 +1,5 @@
-<td>
-	<ul class="list-unstyled">
-		@foreach ($values as $value)
-			<li>{{ $value }}</li>
-		@endforeach
-	</ul>
-</td>
\ No newline at end of file
+<td {!! HTML::attributes($attributes) !!}>
+	@foreach ($values as $value)
+	<span class="label label-info">{{ $value }}</span>
+	@endforeach
+</td>
diff --git a/resources/views/default/column/order.blade.php b/resources/views/default/column/order.blade.php
index 9ca04209a..666c24b19 100644
--- a/resources/views/default/column/order.blade.php
+++ b/resources/views/default/column/order.blade.php
@@ -1,20 +1,18 @@
-<td>
-	<div class="text-right" style="width: 110px;">
-		@if ($movableUp)
-			<form action="{{ $moveUpUrl }}" method="POST" style="display:inline-block;">
-				<input type="hidden" name="_token" value="{{ csrf_token() }}" />
-				<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.moveUp') }}">
-					&uarr;
-				</button>
-			</form>
-		@endif
-		@if ($movableDown)
-			<form action="{{ $moveDownUrl }}" method="POST" style="display:inline-block;">
-				<input type="hidden" name="_token" value="{{ csrf_token() }}" />
-				<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.moveDown') }}">
-					&darr;
-				</button>
-			</form>
-		@endif
-	</div>
-</td>
\ No newline at end of file
+<td {!! HTML::attributes($attributes) !!}>
+	@if ($movableUp)
+		<form action="{{ $moveUpUrl }}" method="POST" style="display:inline-block;">
+			<input type="hidden" name="_token" value="{{ csrf_token() }}" />
+			<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.moveUp') }}">
+				&uarr;
+			</button>
+		</form>
+	@endif
+	@if ($movableDown)
+		<form action="{{ $moveDownUrl }}" method="POST" style="display:inline-block;">
+			<input type="hidden" name="_token" value="{{ csrf_token() }}" />
+			<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.moveDown') }}">
+				&darr;
+			</button>
+		</form>
+	@endif
+</td>
diff --git a/resources/views/default/column/string.blade.php b/resources/views/default/column/string.blade.php
index 0f09bcff9..756d7aa9b 100644
--- a/resources/views/default/column/string.blade.php
+++ b/resources/views/default/column/string.blade.php
@@ -1 +1 @@
-<td>{{ $value }} {!! $append !!}</td>
\ No newline at end of file
+<td {!! HTML::attributes($attributes) !!}>{{ $value }} {!! $append !!}</td>
diff --git a/resources/views/default/column/tree_control.blade.php b/resources/views/default/column/tree_control.blade.php
index f3cc7fa56..bf66fd6a9 100644
--- a/resources/views/default/column/tree_control.blade.php
+++ b/resources/views/default/column/tree_control.blade.php
@@ -1,11 +1,11 @@
 @if ($editable)
-	<a href="{{ $editUrl }}" class="btn btn-default btn-xs" data-toggle="tooltip" title="{{ trans('admin::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
+	<a href="{{ $editUrl }}" class="btn btn-default btn-xs" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
 @endif
 @if ($deletable)
 	<form action="{{ $deleteUrl }}" method="POST" style="display:inline-block;">
 		<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 		<input type="hidden" name="_method" value="DELETE" />
-		<button class="btn btn-danger btn-xs btn-delete" data-toggle="tooltip" title="{{ trans('admin::lang.table.delete') }}">
+		<button class="btn btn-danger btn-xs btn-delete" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.delete') }}">
 			<i class="fa fa-times"></i>
 		</button>
 	</form>
@@ -13,7 +13,7 @@
 @if ($restorable)
 	<form action="{{ $restoreUrl }}" method="POST" style="display:inline-block;">
 		<input type="hidden" name="_token" value="{{ csrf_token() }}" />
-		<button class="btn btn-primary btn-xs" data-toggle="tooltip" title="{{ trans('admin::lang.table.restore') }}">
+		<button class="btn btn-primary btn-xs" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.restore') }}">
 			<i class="fa fa-reply"></i>
 		</button>
 	</form>
diff --git a/resources/views/default/column/url.blade.php b/resources/views/default/column/url.blade.php
index f8ac81b61..519209b74 100644
--- a/resources/views/default/column/url.blade.php
+++ b/resources/views/default/column/url.blade.php
@@ -1,3 +1,5 @@
 @if ( ! is_null($url))
-	<a href="{{ $url }}"><i class="fa fa-arrow-circle-o-right" data-toggle="tooltip" title="{{ trans('admin::lang.table.filter-goto') }}"></i></a>
-@endif
\ No newline at end of file
+	<a href="{{ $url }}">
+		<i class="fa fa-arrow-circle-o-right" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.filter-goto') }}"></i>
+	</a>
+@endif
diff --git a/resources/views/default/columnfilter/filter_list.blade.php b/resources/views/default/columnfilter/filter_list.blade.php
new file mode 100644
index 000000000..373f28fca
--- /dev/null
+++ b/resources/views/default/columnfilter/filter_list.blade.php
@@ -0,0 +1,6 @@
+<tr>
+    @foreach ($columns as $index => $column)
+        <?php $columnFilter = array_get($columnFilters, $index); ?>
+        <td data-index="{{ $index }}">{!! $columnFilter !!}</td>
+    @endforeach
+</tr>
diff --git a/resources/views/default/display/datatables.blade.php b/resources/views/default/display/datatables.blade.php
index 6060df6e8..07084e12f 100644
--- a/resources/views/default/display/datatables.blade.php
+++ b/resources/views/default/display/datatables.blade.php
@@ -5,42 +5,46 @@
 		</div>
 	</div>
 @endif
-@if ($creatable)
-	<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('admin::lang.table.new-entry') }}</a>
-@endif
-<div class="pull-right tableActions">
-	@foreach ($actions as $action)
-		{!! $action !!}
-	@endforeach
-</div>
-<table class="table table-striped datatables" data-order="{{ json_encode($order) }}" data-attributes="{{ json_encode($attributes, JSON_FORCE_OBJECT) }}">
-	<thead>
-		<tr>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		@if ($creatable)
+			{!! link_to($createUrl, trans('sleeping_owl::lang.table.new-entry'), [
+                'class' => 'btn btn-primary btn-labeled', 'data-icon' => 'plus'
+            ]) !!}
+		@endif
+
+		<div class="pull-right tableActions">
+			@foreach ($actions as $action)
+				{!! $action !!}
+			@endforeach
+		</div>
+	</div>
+	<table {!! HTML::attributes($attributes) !!}>
+		<colgroup>
 			@foreach ($columns as $column)
-				{!! $column->header() !!}
+				<col width="{!! $column->getWidth() !!}" />
 			@endforeach
-		</tr>
-	</thead>
-	<tfoot>
+		</colgroup>
+		<thead>
 		<tr>
-			@foreach ($columns as $index => $column)
-				<?php
-					$columnFilter = array_get($columnFilters, $index);
-				?>
-				<td data-index="{{ $index }}">{!! $columnFilter !!}</td>
+			@foreach ($columns as $column)
+				{!! $column->getHeader()->render() !!}
 			@endforeach
 		</tr>
-	</tfoot>
-	<tbody>
-		@foreach ($collection as $instance)
+		</thead>
+		<tbody>
+		@foreach ($collection as $model)
 			<tr>
 				@foreach ($columns as $column)
-					<?php
-						$column->setInstance($instance);
-					?>
-					{!! $column !!}
+					<?php $column->setModel($model); ?>
+					{!! $column->render() !!}
 				@endforeach
 			</tr>
 		@endforeach
-	</tbody>
-</table>
\ No newline at end of file
+		</tbody>
+
+		<tfoot>
+		@include('sleeping_owl::default.columnfilter.filter_list')
+		</tfoot>
+	</table>
+</div>
\ No newline at end of file
diff --git a/resources/views/default/display/datatablesAsync.blade.php b/resources/views/default/display/datatablesAsync.blade.php
index 9d2503621..98ec24e86 100644
--- a/resources/views/default/display/datatablesAsync.blade.php
+++ b/resources/views/default/display/datatablesAsync.blade.php
@@ -5,32 +5,38 @@
 		</div>
 	</div>
 @endif
-@if ($creatable)
-	<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('admin::lang.table.new-entry') }}</a>
-@endif
-<div class="pull-right tableActions">
-	@foreach ($actions as $action)
-		{!! $action !!}
-	@endforeach
-</div>
-<table class="table table-striped datatables" data-order="{{ json_encode($order) }}" data-url="{{ $url }}" data-attributes="{{ json_encode($attributes, JSON_FORCE_OBJECT) }}">
-	<thead>
-		<tr>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		@if ($creatable)
+			{!! link_to($createUrl, trans('sleeping_owl::lang.table.new-entry'), [
+                'class' => 'btn btn-primary btn-labeled', 'data-icon' => 'plus'
+            ]) !!}
+		@endif
+
+		<div class="pull-right tableActions">
+			@foreach ($actions as $action)
+				{!! $action !!}
+			@endforeach
+		</div>
+	</div>
+	<table {!! HTML::attributes($attributes) !!}>
+		<colgroup>
 			@foreach ($columns as $column)
-				{!! $column->header() !!}
+				<col width="{!! $column->getWidth() !!}" />
 			@endforeach
-		</tr>
-	</thead>
-	<tfoot>
+		</colgroup>
+		<thead>
 		<tr>
-			@foreach ($columns as $index => $column)
-				<?php
-					$columnFilter = array_get($columnFilters, $index);
-				?>
-				<td data-index="{{ $index }}">{!! $columnFilter !!}</td>
+			@foreach ($columns as $column)
+				{!! $column->getHeader()->render() !!}
 			@endforeach
 		</tr>
-	</tfoot>
-	<tbody>
-	</tbody>
-</table>
\ No newline at end of file
+		</thead>
+		<tbody>
+		</tbody>
+
+		<tfoot>
+		@include('sleeping_owl::default.columnfilter.filter_list')
+		</tfoot>
+	</table>
+</div>
\ No newline at end of file
diff --git a/resources/views/default/display/tabbed.blade.php b/resources/views/default/display/tabbed.blade.php
index 1a1495a9f..101fa9dc8 100644
--- a/resources/views/default/display/tabbed.blade.php
+++ b/resources/views/default/display/tabbed.blade.php
@@ -6,7 +6,7 @@
 	</ul>
 	<div class="tab-content">
 		@foreach ($tabs as $tab)
-			{!! $tab->content() !!}
+			{!! $tab->getContent()->render() !!}
 		@endforeach
 	</div>
 </div>
\ No newline at end of file
diff --git a/resources/views/default/display/table.blade.php b/resources/views/default/display/table.blade.php
index 0b40d1b70..d1f4fcffa 100644
--- a/resources/views/default/display/table.blade.php
+++ b/resources/views/default/display/table.blade.php
@@ -5,32 +5,43 @@
 		</div>
 	</div>
 @endif
-@if ($creatable)
-	<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('admin::lang.table.new-entry') }}</a>
-@endif
-<div class="pull-right tableActions">
-	@foreach ($actions as $action)
-		{!! $action !!}
-	@endforeach
-</div>
-<table class="table table-striped">
-	<thead>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		@if ($creatable)
+			{!! link_to($createUrl, trans('sleeping_owl::lang.table.new-entry'), [
+                'class' => 'btn btn-primary btn-labeled', 'data-icon' => 'plus'
+            ]) !!}
+		@endif
+
+		<div class="pull-right tableActions">
+			@foreach ($actions as $action)
+				{!! $action !!}
+			@endforeach
+		</div>
+	</div>
+
+	<table {!! HTML::attributes($attributes) !!}>
+		<colgroup>
+			@foreach ($columns as $column)
+				<col width="{!! $column->getWidth() !!}" />
+			@endforeach
+		</colgroup>
+		<thead>
 		<tr>
 			@foreach ($columns as $column)
-				{!! $column->header() !!}
+				{!! $column->getHeader()->render() !!}
 			@endforeach
 		</tr>
-	</thead>
-	<tbody>
-		@foreach ($collection as $instance)
+		</thead>
+		<tbody>
+		@foreach ($collection as $model)
 			<tr>
 				@foreach ($columns as $column)
-					<?php
-						$column->setInstance($instance);
-					?>
-					{!! $column !!}
+					<?php $column->setModel($model); ?>
+					{!! $column->render() !!}
 				@endforeach
 			</tr>
 		@endforeach
-	</tbody>
-</table>
\ No newline at end of file
+		</tbody>
+	</table>
+</div>
diff --git a/resources/views/default/display/tree.blade.php b/resources/views/default/display/tree.blade.php
index d2f16a95e..20217160b 100644
--- a/resources/views/default/display/tree.blade.php
+++ b/resources/views/default/display/tree.blade.php
@@ -1,8 +1,8 @@
 @if ($creatable)
-	<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('admin::lang.table.new-entry') }}</a>
+	<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('sleeping_owl::lang.table.new-entry') }}</a>
 @endif
 <div class="dd nestable" data-url="{{ $url }}/reorder">
 	<ol class="dd-list">
-		@include(AdminTemplate::view('display.tree_children'), ['children' => $items])
+		@include(AdminTemplate::getTemplateViewPath('display.tree_children'), ['children' => $items])
 	</ol>
 </div>
\ No newline at end of file
diff --git a/resources/views/default/display/tree_children.blade.php b/resources/views/default/display/tree_children.blade.php
index 2754819fb..e2fda4936 100644
--- a/resources/views/default/display/tree_children.blade.php
+++ b/resources/views/default/display/tree_children.blade.php
@@ -17,7 +17,7 @@
 		</div>
 		@if ($entry->children->count() > 0)
 			<ol class="dd-list">
-				@include(AdminTemplate::view('display.tree_children'), ['children' => $entry->children])
+				@include(AdminTemplate::getTemplateViewPath('display.tree_children'), ['children' => $entry->children])
 			</ol>
 		@endif
 	</li>
diff --git a/resources/views/default/form/default.blade.php b/resources/views/default/form/default.blade.php
index 098c5ebf4..48365deac 100644
--- a/resources/views/default/form/default.blade.php
+++ b/resources/views/default/form/default.blade.php
@@ -2,10 +2,10 @@
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 	<input type="hidden" name="_redirectBack" value="{{ $backUrl }}" />
 	@foreach ($items as $item)
-		{!! $item !!}
+		{!! $item->render() !!}
 	@endforeach
 	<div class="form-group">
-		<input type="submit" value="{{ trans('admin::lang.table.save') }}" class="btn btn-primary"/>
-		<a href="{{ $backUrl }}" class="btn btn-default">{{ trans('admin::lang.table.cancel') }}</a>
+		<input type="submit" value="{{ trans('sleeping_owl::lang.table.save') }}" class="btn btn-primary"/>
+		<a href="{{ $backUrl }}" class="btn btn-default">{{ trans('sleeping_owl::lang.table.cancel') }}</a>
 	</div>
 </form>
\ No newline at end of file
diff --git a/resources/views/default/form/panel.blade.php b/resources/views/default/form/panel.blade.php
index 47ddbb622..eb8d44f23 100644
--- a/resources/views/default/form/panel.blade.php
+++ b/resources/views/default/form/panel.blade.php
@@ -9,13 +9,13 @@
             </div>
             <div class="panel-body">
                 @foreach ($formItems as $item)
-                    {!! $item !!}
+                    {!! $item->render() !!}
                 @endforeach
             </div>
         </div>
     @endforeach
     <div class="form-group">
-        <input type="submit" value="{{ trans('admin::lang.table.save') }}" class="btn btn-primary flat"/>
-        <a href="{{ $backUrl }}" class="btn btn-default flat">{{ trans('admin::lang.table.cancel') }}</a>
+        <input type="submit" value="{{ trans('sleeping_owl::lang.table.save') }}" class="btn btn-primary flat"/>
+        <a href="{{ $backUrl }}" class="btn btn-default flat">{{ trans('sleeping_owl::lang.table.cancel') }}</a>
     </div>
 </form>
diff --git a/resources/views/default/form/tabbed.blade.php b/resources/views/default/form/tabbed.blade.php
index deadd3776..ed1fb6a7a 100644
--- a/resources/views/default/form/tabbed.blade.php
+++ b/resources/views/default/form/tabbed.blade.php
@@ -18,14 +18,14 @@
 			@foreach ($items as $label => $formItems)
 				<div role="tabpanel" class="tab-pane {!! ($active == $label) ? 'in active' : '' !!}" id="{{ md5($label) }}">
 					@foreach ($formItems as $item)
-						{!! $item !!}
+						{!! $item->render() !!}
 					@endforeach
 				</div>
 			@endforeach
 		</div>
 	</div>
 	<div class="form-group">
-		<input type="submit" value="{{ trans('admin::lang.table.save') }}" class="btn btn-primary"/>
-		<a href="{{ $backUrl }}" class="btn btn-default">{{ trans('admin::lang.table.cancel') }}</a>
+		<input type="submit" value="{{ trans('sleeping_owl::lang.table.save') }}" class="btn btn-primary"/>
+		<a href="{{ $backUrl }}" class="btn btn-default">{{ trans('sleeping_owl::lang.table.cancel') }}</a>
 	</div>
 </form>
\ No newline at end of file
diff --git a/resources/views/default/formitem/checkbox.blade.php b/resources/views/default/formitem/checkbox.blade.php
index da22155b3..ece76230e 100644
--- a/resources/views/default/formitem/checkbox.blade.php
+++ b/resources/views/default/formitem/checkbox.blade.php
@@ -4,5 +4,5 @@
 			<input type="checkbox" name="{{ $name }}" value="1" {!! $value ? 'checked="checked"' : '' !!} />{{ $label }}
 		</label>
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/ckeditor.blade.php b/resources/views/default/formitem/ckeditor.blade.php
index 59af9f455..846631695 100644
--- a/resources/views/default/formitem/ckeditor.blade.php
+++ b/resources/views/default/formitem/ckeditor.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
 	<label for="{{ $name }}">{{ $label }}</label>
 	<textarea class="ckeditor" name="{{ $name }}">{!! $value !!}</textarea>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/date.blade.php b/resources/views/default/formitem/date.blade.php
index 448a10daf..e5c644b55 100644
--- a/resources/views/default/formitem/date.blade.php
+++ b/resources/views/default/formitem/date.blade.php
@@ -4,5 +4,5 @@
 		<input data-date-format="{{ $pickerFormat }}" data-date-pickdate="true" data-date-picktime="false" data-date-useseconds="{{ $seconds ? 'true' : 'false' }}" class="form-control" name="{{ $name }}" type="text" id="{{ $name }}" value="{{ $value }}" @if(isset($readonly))readonly="{{ $readonly }}"@endif>
 		<span class="input-group-addon"><span class="fa fa-clock-o"></span></span>
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/file.blade.php b/resources/views/default/formitem/file.blade.php
index db0ebb3c6..2edfb25a2 100644
--- a/resources/views/default/formitem/file.blade.php
+++ b/resources/views/default/formitem/file.blade.php
@@ -7,17 +7,17 @@
 					<i class="fa fa-fw fa-file-o"></i> no file
 				</div>
 				<div class="has-value {{ empty($value) ? 'hidden' : '' }}">
-					<a href="{{ asset($value) }}" data-toggle="tooltip" title="{{ trans('admin::lang.table.download') }}"><i class="fa fa-fw fa-file-o"></i> <span>{{ $value }}</span></a>
+					<a href="{{ asset($value) }}" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.download') }}"><i class="fa fa-fw fa-file-o"></i> <span>{{ $value }}</span></a>
 				</div>
 			</div>
 		</div>
 		<div>
-			<div class="btn btn-primary imageBrowse"><i class="fa fa-upload"></i> {{ trans('admin::lang.file.browse') }}</div>
-			<div class="btn btn-danger imageRemove"><i class="fa fa-times"></i> {{ trans('admin::lang.file.remove') }}</div>
+			<div class="btn btn-primary imageBrowse"><i class="fa fa-upload"></i> {{ trans('sleeping_owl::lang.file.browse') }}</div>
+			<div class="btn btn-danger imageRemove"><i class="fa fa-times"></i> {{ trans('sleeping_owl::lang.file.remove') }}</div>
 		</div>
 		<input name="{{ $name }}" class="imageValue" type="hidden" value="{{ $value }}">
 		<div class="errors">
-			@include(AdminTemplate::view('formitem.errors'))
+			@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/image.blade.php b/resources/views/default/formitem/image.blade.php
index 44ff7205b..ed6ffecf8 100644
--- a/resources/views/default/formitem/image.blade.php
+++ b/resources/views/default/formitem/image.blade.php
@@ -8,12 +8,12 @@
 			</div>
 		</div>
 		<div>
-			<div class="btn btn-primary imageBrowse"><i class="fa fa-upload"></i> {{ trans('admin::lang.image.browse') }}</div>
-			<div class="btn btn-danger imageRemove"><i class="fa fa-times"></i> {{ trans('admin::lang.image.remove') }}</div>
+			<div class="btn btn-primary imageBrowse"><i class="fa fa-upload"></i> {{ trans('sleeping_owl::lang.image.browse') }}</div>
+			<div class="btn btn-danger imageRemove"><i class="fa fa-times"></i> {{ trans('sleeping_owl::lang.image.remove') }}</div>
 		</div>
 		<input name="{{ $name }}" class="imageValue" type="hidden" value="{{ $value }}">
 		<div class="errors">
-			@include(AdminTemplate::view('formitem.errors'))
+			@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/images.blade.php b/resources/views/default/formitem/images.blade.php
index 52a513a48..1d5d5d55c 100644
--- a/resources/views/default/formitem/images.blade.php
+++ b/resources/views/default/formitem/images.blade.php
@@ -12,11 +12,11 @@
 			@endforeach
 		</div>
 		<div>
-			<div class="btn btn-primary imageBrowse"><i class="fa fa-upload"></i> {{ trans('admin::lang.image.browseMultiple') }}</div>
+			<div class="btn btn-primary imageBrowse"><i class="fa fa-upload"></i> {{ trans('sleeping_owl::lang.image.browseMultiple') }}</div>
 		</div>
 		<input name="{{ $name }}" class="imageValue" type="hidden" value="{{ implode(',', $value) }}">
 		<div class="errors">
-			@include(AdminTemplate::view('formitem.errors'))
+			@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/multiselect.blade.php b/resources/views/default/formitem/multiselect.blade.php
index 3db6692e4..55fa80834 100644
--- a/resources/views/default/formitem/multiselect.blade.php
+++ b/resources/views/default/formitem/multiselect.blade.php
@@ -7,5 +7,5 @@
 			@endforeach
 		</select>
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/password.blade.php b/resources/views/default/formitem/password.blade.php
index d1de7f2f3..17ecace8a 100644
--- a/resources/views/default/formitem/password.blade.php
+++ b/resources/views/default/formitem/password.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
 	<label for="{{ $name }}">{{ $label }}</label>
 	<input class="form-control" name="{{ $name }}" type="password" id="{{ $name }}" value="" @if(isset($readonly))readonly="{{ $readonly }}"@endif>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/radio.blade.php b/resources/views/default/formitem/radio.blade.php
index ee820d354..4445fc085 100644
--- a/resources/views/default/formitem/radio.blade.php
+++ b/resources/views/default/formitem/radio.blade.php
@@ -4,7 +4,7 @@
 		<div class="radio">
 			<label>
 				<input type="radio" name="{{ $name }}" value="" {!! ($value == null) ? 'checked' : '' !!}/>
-				{{ trans('admin::lang.select.nothing') }}
+				{{ trans('sleeping_owl::lang.select.nothing') }}
 			</label>
 		</div>
 	@endif
@@ -16,5 +16,5 @@
 			</label>
 		</div>
 	@endforeach
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/select.blade.php b/resources/views/default/formitem/select.blade.php
index 5f43f152b..2e5782136 100644
--- a/resources/views/default/formitem/select.blade.php
+++ b/resources/views/default/formitem/select.blade.php
@@ -10,5 +10,5 @@
 			@endforeach
 		</select>
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/text.blade.php b/resources/views/default/formitem/text.blade.php
index 7ff93c2c4..c2b20a9c0 100644
--- a/resources/views/default/formitem/text.blade.php
+++ b/resources/views/default/formitem/text.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
 	<label for="{{ $name }}">{{ $label }}</label>
 	<input class="form-control" name="{{ $name }}" type="text" id="{{ $name }}" value="{{ $value }}" @if(isset($readonly))readonly="{{ $readonly }}" @endif>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/textaddon.blade.php b/resources/views/default/formitem/textaddon.blade.php
index 1511d2aaf..95bfff1eb 100644
--- a/resources/views/default/formitem/textaddon.blade.php
+++ b/resources/views/default/formitem/textaddon.blade.php
@@ -9,5 +9,5 @@
 			<span class="input-group-addon">{!! $addon !!}</span>
 		@endif
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/textarea.blade.php b/resources/views/default/formitem/textarea.blade.php
index 6ceca0e3d..49978b937 100644
--- a/resources/views/default/formitem/textarea.blade.php
+++ b/resources/views/default/formitem/textarea.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
 	<label for="{{ $name }}">{{ $label }}</label>
 	<textarea class="form-control" rows="{{ $rows }}" name="{{ $name }}" @if(isset($readonly))readonly="{{ $readonly }}"@endif>{!! $value !!}</textarea>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/time.blade.php b/resources/views/default/formitem/time.blade.php
index e3ab1f930..e42b0f99d 100644
--- a/resources/views/default/formitem/time.blade.php
+++ b/resources/views/default/formitem/time.blade.php
@@ -4,5 +4,5 @@
 		<input data-date-format="{{ $pickerFormat }}" data-date-pickdate="false" data-date-useseconds="{{ $seconds ? 'true' : 'false' }}" class="form-control" name="{{ $name }}" type="text" id="{{ $name }}" value="{{ $value }}" @if(isset($readonly))readonly="{{ $readonly }}"@endif>
 		<span class="input-group-addon"><span class="fa fa-clock-o"></span></span>
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/timestamp.blade.php b/resources/views/default/formitem/timestamp.blade.php
index c419849e7..ffb842b65 100644
--- a/resources/views/default/formitem/timestamp.blade.php
+++ b/resources/views/default/formitem/timestamp.blade.php
@@ -4,5 +4,5 @@
 		<input data-date-format="{{ $pickerFormat }}" data-date-useseconds="{{ $seconds ? 'true' : 'false' }}" class="form-control" name="{{ $name }}" type="text" id="{{ $name }}" value="{{ $value }}" @if(isset($readonly))readonly="{{ $readonly }}"@endif>
 		<span class="input-group-addon"><span class="fa fa-clock-o"></span></span>
 	</div>
-	@include(AdminTemplate::view('formitem.errors'))
+	@include(AdminTemplate::getTemplateViewPath('formitem.errors'))
 </div>
\ No newline at end of file
diff --git a/resources/views/default/formitem/wysiwyg.blade.php b/resources/views/default/formitem/wysiwyg.blade.php
new file mode 100644
index 000000000..ea516dabc
--- /dev/null
+++ b/resources/views/default/formitem/wysiwyg.blade.php
@@ -0,0 +1,23 @@
+<script>
+    $(function(){
+        CMS.filters.switchOn('{{ $name }}', '{{ $editor }}', {
+            height: {{ $height }}
+        });
+    });
+</script>
+<div class="form-group {{ $errors->has($name) ? 'has-error' : '' }}">
+    <label for="{{ $name }}" class="control-label col-md-3">{{ $label }}</label>
+
+    <div class="col-md-9">
+        {!! Form::textarea($name, $value, [
+            'class' => 'form-control',
+            'id' => $name
+        ]) !!}
+
+        @if(!empty($helpText))
+            <span class="help-block">{!! $helpText !!}</span>
+        @endif
+
+        @include(app('sleeping_owl.template')->getTemplateViewPath('formitem.errors'))
+    </div>
+</div>
diff --git a/resources/views/default/pages/login.blade.php b/resources/views/default/pages/login.blade.php
index 9a1df7dac..d41ab0a03 100644
--- a/resources/views/default/pages/login.blade.php
+++ b/resources/views/default/pages/login.blade.php
@@ -1,4 +1,4 @@
-@extends(AdminTemplate::view('_layout.base'))
+@extends(AdminTemplate::getTemplateViewPath('_layout.base'))
 
 @section('content')
     <div class="container">
@@ -6,7 +6,7 @@
             <div class="col-md-4 col-md-offset-4">
                 <div class="login-panel panel panel-default">
                     <div class="panel-heading">
-                        <h3 class="panel-title">{{ trans('admin::lang.auth.title') }}</h3>
+                        <h3 class="panel-title">{{ trans('sleeping_owl::lang.auth.title') }}</h3>
                     </div>
                     <div class="panel-body">
                     	<form action="{{ $loginPostUrl }}" method="post">
@@ -14,13 +14,13 @@
                             <fieldset>
                                 <div class="form-group <?=($errors->has('username')) ? 'has-error' : ''?>">
                                     {!! $errors->first('username', '<label for="username" class="control-label">:message</label>') !!}
-                                    <input type="text" name="username" id="username" class="form-control" placeholder="{{ trans('admin::lang.auth.username') }}" autofocus />
+                                    <input type="text" name="username" id="username" class="form-control" placeholder="{{ trans('sleeping_owl::lang.auth.username') }}" autofocus />
                                 </div>
                                 <div class="form-group <?=($errors->has('password')) ? 'has-error' : ''?>">
                                     {!! $errors->first('password', '<label for="password" class="control-label">:message</label>') !!}
-                                    <input type="password" name="password" id="password" class="form-control" placeholder="{{ trans('admin::lang.auth.password') }}" />
+                                    <input type="password" name="password" id="password" class="form-control" placeholder="{{ trans('sleeping_owl::lang.auth.password') }}" />
                                 </div>
-                                <input type="submit" value="{{ trans('admin::lang.auth.login') }}" class="btn btn-lg btn-success btn-block" />
+                                <input type="submit" value="{{ trans('sleeping_owl::lang.auth.login') }}" class="btn btn-lg btn-success btn-block" />
                             </fieldset>
                         </form>
                     </div>
diff --git a/src/Display/DisplayDatatablesAsync.php b/src/Display/DisplayDatatablesAsync.php
index 881806eac..aacebb3fe 100644
--- a/src/Display/DisplayDatatablesAsync.php
+++ b/src/Display/DisplayDatatablesAsync.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\Display;
 
-use Input;
+use Request;
 use Route;
 use Illuminate\Support\Collection;
 use SleepingOwl\Admin\Column\String;
@@ -121,7 +121,7 @@ public function render()
     public function getParams()
     {
         $params = parent::getParams();
-        $attributes = Input::all();
+        $attributes = Request::all();
         array_unshift($attributes, $this->getName());
         array_unshift($attributes, $this->getModel()->alias());
         $params['url'] = route('admin.model.async', $attributes);
@@ -165,8 +165,8 @@ public function renderAsync()
      */
     protected function applyOffset($query)
     {
-        $offset = Input::get('start', 0);
-        $limit = Input::get('length', 10);
+        $offset = Request::get('start', 0);
+        $limit = Request::get('length', 10);
 
         if ($limit == -1) {
             return;
@@ -182,7 +182,7 @@ protected function applyOffset($query)
      */
     protected function applyOrders($query)
     {
-        $orders = Input::get('order', []);
+        $orders = Request::get('order', []);
 
         foreach ($orders as $order) {
             $columnIndex = $order['column'];
@@ -203,7 +203,7 @@ protected function applyOrders($query)
      */
     protected function applySearch(Builder $query)
     {
-        $search = Input::get('search.value');
+        $search = Request::get('search.value');
         if (is_null($search)) {
             return;
         }
@@ -226,7 +226,7 @@ protected function applySearch(Builder $query)
      */
     protected function applyColumnSearch(Builder $query)
     {
-        $queryColumns = Input::get('columns', []);
+        $queryColumns = Request::get('columns', []);
 
         foreach ($queryColumns as $index => $queryColumn) {
 
@@ -255,7 +255,7 @@ protected function prepareDatatablesStructure(Collection $collection, $totalCoun
         $columns = $this->allColumns();
 
         $result = [];
-        $result['draw'] = Input::get('draw', 0);
+        $result['draw'] = Request::get('draw', 0);
         $result['recordsTotal'] = $totalCount;
         $result['recordsFiltered'] = $filteredCount;
         $result['data'] = [];
diff --git a/src/Display/DisplayTable.php b/src/Display/DisplayTable.php
index b4f5b70cc..6d5fa1b12 100644
--- a/src/Display/DisplayTable.php
+++ b/src/Display/DisplayTable.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\Display;
 
-use Input;
+use Request;
 use Closure;
 use SleepingOwl\Admin\Column;
 use Illuminate\Database\Eloquent\Builder;
@@ -391,7 +391,7 @@ public function getParams()
             'title'     => $this->getTitle(),
             'columns'   => $this->getAllColumns(),
             'creatable' => ! is_null($model->fireCreate()),
-            'createUrl' => $model->getCreateUrl($this->getParameters() + Input::all()),
+            'createUrl' => $model->getCreateUrl($this->getParameters() + Request::all()),
             'actions'   => $this->getActions(),
             'attributes' => $this->getAttributes()
         ];
@@ -443,9 +443,9 @@ protected function getRepository()
 
     protected function initializeAction()
     {
-        $action = Input::get('_action');
-        $id = Input::get('_id');
-        $ids = Input::get('_ids');
+        $action = Request::get('_action');
+        $id = Request::get('_id');
+        $ids = Request::get('_ids');
 
         if (! is_null($action) && (! is_null($id) || ! is_null($ids))) {
             $columns = array_merge($this->getColumns(), $this->getActions());
diff --git a/src/Display/DisplayTree.php b/src/Display/DisplayTree.php
index f029e9209..e47bb2c11 100644
--- a/src/Display/DisplayTree.php
+++ b/src/Display/DisplayTree.php
@@ -250,7 +250,7 @@ public function getParams()
             'url'         => $model->getDisplayUrl(),
             'value'       => $this->getValue(),
             'creatable'   => ! is_null($model->create()),
-            'createUrl'   => $model->createUrl($this->getParameters() + Input::all()),
+            'createUrl'   => $model->createUrl($this->getParameters() + Request::all()),
             'controls'    => [Column::treeControl()],
         ];
     }
diff --git a/src/Filter/FilterBase.php b/src/Filter/FilterBase.php
index 62510d556..bf48fae2b 100644
--- a/src/Filter/FilterBase.php
+++ b/src/Filter/FilterBase.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\Filter;
 
-use Input;
+use Request;
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use SleepingOwl\Admin\Exceptions\FilterOperatorException;
@@ -195,7 +195,7 @@ public function setOperator($operator)
     public function getValue($default = null)
     {
         if (is_null($this->value)) {
-            $this->value = Input::get($this->getAlias(), $default);
+            $this->value = Request::get($this->getAlias(), $default);
         }
 
         $params = $this->getOperatorParams();
diff --git a/src/Form/FormDefault.php b/src/Form/FormDefault.php
index 0c3ebc0b8..38f3aeabc 100644
--- a/src/Form/FormDefault.php
+++ b/src/Form/FormDefault.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Collection;
 use URL;
-use Input;
+use Request;
 use Validator;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Support\Renderable;
@@ -252,7 +252,7 @@ public function validate(ModelConfiguration $model)
             }
         });
 
-        $data = Input::all();
+        $data = Request::all();
         $verifier = app('validation.presence');
         $verifier->setConnection($this->getModelObject()->getConnectionName());
         $validator = Validator::make($data, $rules);
diff --git a/src/FormItems/CKEditor.php b/src/FormItems/CKEditor.php
index c287ca8be..4b4774862 100644
--- a/src/FormItems/CKEditor.php
+++ b/src/FormItems/CKEditor.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\FormItems;
 
-use Input;
+use Request;
 use Route;
 use stdClass;
 use Exception;
@@ -88,7 +88,7 @@ protected static function postUpload()
         $maxheight = 8000;
         $minwidth = 10;
         $minheight = 10;
-        $file = Input::file('upload');
+        $file = Request::file('upload');
         $errors = [];
         $extension = null;
         $width = 0;
@@ -140,7 +140,7 @@ protected static function postUpload()
 
         $finalFilename = $file->getClientOriginalName();
         $file = $file->move($upload_dir, $finalFilename);
-        $CKEditorFuncNum = Input::get('CKEditorFuncNum');
+        $CKEditorFuncNum = Request::get('CKEditorFuncNum');
         $url = asset($path.$finalFilename);
 
         $message = trans('sleeping_owl::core.ckeditor.upload.success', [
diff --git a/src/FormItems/Checkbox.php b/src/FormItems/Checkbox.php
index 1cfe217b7..228382429 100644
--- a/src/FormItems/Checkbox.php
+++ b/src/FormItems/Checkbox.php
@@ -2,15 +2,15 @@
 
 namespace SleepingOwl\Admin\FormItems;
 
-use Input;
+use Request;
 
 class Checkbox extends NamedFormItem
 {
     public function save()
     {
         $name = $this->getName();
-        if (! Input::has($name)) {
-            Input::merge([$name => 0]);
+        if (! Request::has($name)) {
+            Request::merge([$name => 0]);
         }
 
         parent::save();
diff --git a/src/FormItems/Image.php b/src/FormItems/Image.php
index 079df2d49..a7da50648 100644
--- a/src/FormItems/Image.php
+++ b/src/FormItems/Image.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\FormItems;
 
-use Input;
+use Request;
 use Route;
 use Response;
 use Validator;
@@ -19,12 +19,12 @@ public static function registerRoutes()
     {
         Route::post('formitems/image/'.static::$route, ['as' => 'admin.formitems.image.'.static::$route,
             function () {
-                $validator = Validator::make(Input::all(), static::uploadValidationRules());
+                $validator = Validator::make(Request::all(), static::uploadValidationRules());
                 if ($validator->fails()) {
                     return Response::make($validator->errors()->get('file'), 400);
                 }
 
-                $file = Input::file('file');
+                $file = Request::file('file');
                 $filename = md5(time().$file->getClientOriginalName()).'.'.$file->getClientOriginalExtension();
                 $path = config('sleeping_owl.imagesUploadDirectory');
                 $fullpath = public_path($path);
diff --git a/src/FormItems/Images.php b/src/FormItems/Images.php
index 714ce18c2..1ab01214d 100644
--- a/src/FormItems/Images.php
+++ b/src/FormItems/Images.php
@@ -3,7 +3,7 @@
 namespace SleepingOwl\Admin\FormItems;
 
 use Meta;
-use Input;
+use Request;
 
 class Images extends Image
 {
@@ -15,7 +15,7 @@ public function initialize()
     public function save()
     {
         $name = $this->getName();
-        $value = Input::get($name, '');
+        $value = Request::get($name, '');
 
         if (! empty($value)) {
             $value = explode(',', $value);
@@ -23,7 +23,7 @@ public function save()
             $value = [];
         }
 
-        Input::merge([$name => $value]);
+        Request::merge([$name => $value]);
         parent::save();
     }
 
diff --git a/src/FormItems/MultiSelect.php b/src/FormItems/MultiSelect.php
index 239a325d3..3a18c8ea7 100644
--- a/src/FormItems/MultiSelect.php
+++ b/src/FormItems/MultiSelect.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\FormItems;
 
-use Input;
+use Request;
 use Illuminate\Database\Eloquent\Collection;
 
 class MultiSelect extends Select
@@ -37,7 +37,7 @@ public function save()
     {
         $attribute = $this->getAttribute();
 
-        if (is_null(Input::get($this->getPath()))) {
+        if (is_null(Request::get($this->getPath()))) {
             $values = [];
         } else {
             $values = $this->getValue();
diff --git a/src/FormItems/NamedFormItem.php b/src/FormItems/NamedFormItem.php
index a86d6879b..10fdde6f6 100644
--- a/src/FormItems/NamedFormItem.php
+++ b/src/FormItems/NamedFormItem.php
@@ -2,7 +2,7 @@
 
 namespace SleepingOwl\Admin\FormItems;
 
-use Input;
+use Request;
 
 abstract class NamedFormItem extends BaseFormItem
 {
@@ -210,7 +210,7 @@ public function getValue()
             return $value;
         }
 
-        $input = Input::all();
+        $input = Request::all();
         if (($value = array_get($input, $this->getPath())) !== null) {
             return $value;
         }
@@ -283,7 +283,7 @@ public function save()
     {
         $attribute = $this->getAttribute();
 
-        if (Input::get($this->getPath()) === null) {
+        if (Request::get($this->getPath()) === null) {
             $value = null;
         } else {
             $value = $this->getValue();
diff --git a/src/Providers/AdminServiceProvider.php b/src/Providers/AdminServiceProvider.php
new file mode 100644
index 000000000..56915c096
--- /dev/null
+++ b/src/Providers/AdminServiceProvider.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace SleepingOwl\Admin\Providers;
+
+use Route;
+use SleepingOwl\Admin\Admin;
+use KodiCMS\Navigation\Navigation;
+use Symfony\Component\Finder\Finder;
+use SleepingOwl\Admin\Filter\Filter;
+use SleepingOwl\Admin\Form\AdminForm;
+use Illuminate\Foundation\AliasLoader;
+use Illuminate\Support\ServiceProvider;
+use SleepingOwl\Admin\FormItems\FormItem;
+use SleepingOwl\Admin\Display\AdminDisplay;
+use SleepingOwl\Admin\Facades\AdminSection;
+use SleepingOwl\Admin\Facades\AdminTemplate;
+use SleepingOwl\Admin\Facades\AdminNavigation;
+use SleepingOwl\Admin\Column\Filter\ColumnFilter;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+
+class AdminServiceProvider extends ServiceProvider
+{
+    protected $directory;
+
+    public function register()
+    {
+        $this->app->singleton('sleeping_owl', function () {
+            return new Admin();
+        });
+
+        $this->app->singleton('sleeping_owl.navigation', function () {
+            $items = [];
+            if (file_exists($navigation = config('sleeping_owl.bootstrapDirectory').DIRECTORY_SEPARATOR.'navigation.php')) {
+                $items = include $navigation;
+            }
+
+            return new Navigation($items);
+        });
+
+        $this->registerAliases();
+    }
+
+    public function boot()
+    {
+        $this->app->singleton('sleeping_owl.template', function () {
+            return $this->app['sleeping_owl']->template();
+        });
+
+        $this->registerBootstrap();
+        $this->registerPatterns();
+    }
+
+    /**
+     * @return array
+     */
+    protected function registerBootstrap()
+    {
+        $directory = config('sleeping_owl.bootstrapDirectory');
+
+        if (! is_dir($directory)) {
+            return;
+        }
+
+        $files = $files = Finder::create()
+            ->files()
+            ->name('/^.+\.php$/')
+            ->notName('routes.php')
+            ->notName('navigation.php')
+            ->in($directory)->sort(function ($a) {
+                return $a->getFilename() != 'bootstrap.php';
+            });
+
+
+        foreach ($files as $file) {
+            require $file;
+        }
+    }
+
+    protected function registerPatterns()
+    {
+        Route::pattern('adminModelId', '[0-9]+');
+
+        $aliases = $this->app['sleeping_owl']->modelAliases();
+
+        if (count($aliases) > 0) {
+            Route::pattern('adminModel', implode('|', $aliases));
+
+            Route::bind('adminModel', function ($model) use ($aliases) {
+                $class = array_search($model, $aliases);
+                if ($class === false) {
+                    throw new ModelNotFoundException;
+                }
+
+                return $this->app['sleeping_owl']->getModel($class);
+            });
+        }
+
+        Route::pattern('adminWildcard', '.*');
+    }
+
+    public function registerAliases()
+    {
+        AliasLoader::getInstance([
+            'AdminSection'      => AdminSection::class,
+            'AdminTemplate'     => AdminTemplate::class,
+            'AdminNavigation'   => AdminNavigation::class,
+            'AdminColumn'       => Column::class,
+            'AdminColumnFilter' => ColumnFilter::class,
+            'AdminFilter'       => Filter::class,
+            'AdminForm'         => AdminForm::class,
+            'AdminFormItem'     => FormItem::class,
+            'AdminDisplay'      => AdminDisplay::class
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/src/Providers/BootstrapServiceProvider.php b/src/Providers/BootstrapServiceProvider.php
deleted file mode 100644
index afaba6418..000000000
--- a/src/Providers/BootstrapServiceProvider.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use Symfony\Component\Finder\Finder;
-use Illuminate\Support\ServiceProvider;
-
-class BootstrapServiceProvider extends ServiceProvider
-{
-    protected $directory;
-
-    public function register()
-    {
-        $this->directory = config('sleeping_owl.bootstrapDirectory');
-
-        if (! is_dir($this->directory)) {
-            return;
-        }
-
-        $files = $this->getAllFiles();
-        foreach ($files as $file) {
-            require $file;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    protected function getAllFiles()
-    {
-        $files = Finder::create()
-            ->files()
-            ->name('/^.+\.php$/')
-            ->notName('routes.php')
-            ->notName('navigation.php')
-            ->in($this->directory);
-
-        $files->sort(function ($a) {
-            return $a->getFilename() != 'bootstrap.php';
-        });
-
-        return $files;
-    }
-}
\ No newline at end of file
diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php
index bb2446968..abba7558a 100644
--- a/src/Providers/RouteServiceProvider.php
+++ b/src/Providers/RouteServiceProvider.php
@@ -4,15 +4,12 @@
 
 use Route;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class RouteServiceProvider extends ServiceProvider
 {
 
     public function register()
     {
-        $this->registerPatterns();
-
         Route::group([
             'prefix'    => config('sleeping_owl.prefix'),
             'namespace' => 'SleepingOwl\Admin\Http\Controllers',
@@ -37,26 +34,4 @@ public static function registerRoutes($callback)
             'middleware' => config('sleeping_owl.middleware'),
         ], $callback);
     }
-
-    protected function registerPatterns()
-    {
-        Route::pattern('adminModelId', '[0-9]+');
-
-        $aliases = $this->app['sleeping_owl']->modelAliases();
-
-        if (count($aliases) > 0) {
-            Route::pattern('adminModel', implode('|', $aliases));
-            Route::bind('adminModel', function ($model) use ($aliases) {
-                $class = array_search($model, $aliases);
-
-                if ($class === false) {
-                    throw new ModelNotFoundException;
-                }
-
-                return $this->app['sleeping_owl']->getModel($class);
-            });
-        }
-
-        Route::pattern('adminWildcard', '.*');
-    }
 }
\ No newline at end of file
diff --git a/src/Providers/SleepingOwlServiceProvider.php b/src/Providers/SleepingOwlServiceProvider.php
index cfebc2c10..3fed1a9d6 100644
--- a/src/Providers/SleepingOwlServiceProvider.php
+++ b/src/Providers/SleepingOwlServiceProvider.php
@@ -4,36 +4,20 @@
 
 use Collective\Html\FormFacade;
 use Collective\Html\HtmlFacade;
-use Collective\Html\HtmlServiceProvider;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
+use KodiCMS\Assets\Facades\Meta;
+use KodiCMS\Assets\Facades\Assets;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
+use Collective\Html\HtmlServiceProvider;
 use KodiCMS\Assets\AssetsServiceProvider;
-use KodiCMS\Assets\Facades\Assets;
-use KodiCMS\Assets\Facades\Meta;
 use KodiCMS\Assets\Facades\PackageManager;
-use KodiCMS\Navigation\Navigation;
-use Route;
-use SleepingOwl\Admin\Admin;
-use SleepingOwl\Admin\Column\Filter\ColumnFilter;
 use SleepingOwl\Admin\Commands\InstallCommand;
-use SleepingOwl\Admin\Display\AdminDisplay;
-use SleepingOwl\Admin\Facades\AdminNavigation;
-use SleepingOwl\Admin\Facades\AdminSection;
-use SleepingOwl\Admin\Facades\AdminTemplate;
-use SleepingOwl\Admin\Filter\Filter;
-use SleepingOwl\Admin\Form\AdminForm;
-use SleepingOwl\Admin\FormItems\FormItem;
 
 class SleepingOwlServiceProvider extends ServiceProvider
 {
 
     public function register()
     {
-        $this->app->singleton('sleeping_owl', function () {
-            return new Admin();
-        });
-
         $this->registerProviders();
         $this->registerAliases();
         $this->registerCommands();
@@ -41,20 +25,6 @@ public function register()
 
     public function boot()
     {
-        $this->app->singleton('sleeping_owl.template', function () {
-            return $this->app['sleeping_owl']->template();
-        });
-
-        $this->app->singleton('sleeping_owl.navigation', function () {
-            $items = [];
-            if (file_exists($navigation = config('sleeping_owl.bootstrapDirectory').DIRECTORY_SEPARATOR.'navigation.php')) {
-                $items = include $navigation;
-            }
-
-            return new Navigation($items);
-        });
-
-
         $this->loadViewsFrom(__DIR__.'/../../resources/views', 'sleeping_owl');
         $this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'sleeping_owl');
         $this->mergeConfigFrom(__DIR__.'/../../config/sleeping_owl.php', 'sleeping_owl');
@@ -83,7 +53,7 @@ public function registerProviders()
             FormItemServiceProvider::class,
             AssetsServiceProvider::class,
             HtmlServiceProvider::class,
-            BootstrapServiceProvider::class,
+            AdminServiceProvider::class,
             RouteServiceProvider::class
         ];
 
@@ -95,15 +65,6 @@ public function registerProviders()
     public function registerAliases()
     {
         AliasLoader::getInstance([
-            'AdminSection'      => AdminSection::class,
-            'AdminTemplate'     => AdminTemplate::class,
-            'AdminNavigation'   => AdminNavigation::class,
-            'AdminColumn'       => Column::class,
-            'AdminColumnFilter' => ColumnFilter::class,
-            'AdminFilter'       => Filter::class,
-            'AdminForm'         => AdminForm::class,
-            'AdminFormItem'     => FormItem::class,
-            'AdminDisplay'      => AdminDisplay::class,
             'Assets'            => Assets::class,
             'PackageManager'    => PackageManager::class,
             'Meta'              => Meta::class,