diff --git a/composer.json b/composer.json
index f0e0e41..b2f4528 100755
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^7.2",
-        "mockery/mockery": "^1.1"
+        "mockery/mockery": "^1.1",
+        "laravel/framework": "^8.20",
+        "laravel/laravel": "^8.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/publishes/mix/resources/js/components/fields/DateTimePicker.vue b/publishes/mix/resources/js/components/fields/DateTimePicker.vue
index 30055ef..3ff4994 100644
--- a/publishes/mix/resources/js/components/fields/DateTimePicker.vue
+++ b/publishes/mix/resources/js/components/fields/DateTimePicker.vue
@@ -54,4 +54,4 @@
             this.value = this.defaultValue || null;
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/publishes/views/auth/login.blade.php b/publishes/views/auth/login.blade.php
index 22feef7..3821d29 100755
--- a/publishes/views/auth/login.blade.php
+++ b/publishes/views/auth/login.blade.php
@@ -38,9 +38,6 @@
                 </div>
             </div>
             <div class="form-group">
-                <div class="pull-right">
-                    <a href="#">Forgot password?</a>
-                </div>
                 <div class="pull-left">
                     <input name="remember_me" type="hidden" value="0"/>
                     <input type="checkbox" name="remember_me" value="1"/> {{ trans('administrator::buttons.remember_me') }}
diff --git a/publishes/views/components/index/index.blade.php b/publishes/views/components/index/index.blade.php
index 84a6405..7c59fb8 100644
--- a/publishes/views/components/index/index.blade.php
+++ b/publishes/views/components/index/index.blade.php
@@ -1,6 +1,6 @@
 <div class="panel">
     <div class="panel-body">
-        <form method="post" id="collection" action="{{ route('scaffold.batch', ['module' => $resource->url()]) }}">
+        <form method="post" id="collection" target="_self" action="{{ route('scaffold.batch', ['module' => $resource->url()]) }}">
             <?php echo Form::hidden('batch_action', null, ['id' => 'batch_action']); ?>
             <?php echo Form::token(); ?>
 
diff --git a/publishes/views/components/table/row.blade.php b/publishes/views/components/table/row.blade.php
index 7de3e35..3a3c6e9 100644
--- a/publishes/views/components/table/row.blade.php
+++ b/publishes/views/components/table/row.blade.php
@@ -11,12 +11,14 @@
     @endcomponent
 @else
     <tr>
-        <td style="width: 20%; min-width: 200px;">
-            {!! $label ?? '' !!}
-            @if (isset($description) && !empty($description))
-                <p class="small">{!! $description !!}</p>
-            @endif
-        </td>
-        <td>{!! $input ?? '' !!}</td>
+        @if(!empty($label))
+            <td style="width: 20%; min-width: 200px;">
+                {!! $label ?? '' !!}
+                @if (isset($description) && !empty($description))
+                    <p class="small">{!! $description !!}</p>
+                @endif
+            </td>
+        @endif
+        <td {!! (!empty($label) ? '' : 'colspan="2"') !!}>{!! $input ?? '' !!}</td>
     </tr>
 @endif
diff --git a/publishes/views/fields/belongs_to/edit.blade.php b/publishes/views/fields/belongs_to/edit.blade.php
index ca82a78..2ef3657 100644
--- a/publishes/views/fields/belongs_to/edit.blade.php
+++ b/publishes/views/fields/belongs_to/edit.blade.php
@@ -4,8 +4,8 @@
 
 @if ($searchable && $searchIn)
     <instant-search
-            name="{{ $field->name() }}"
-            data-url="/cms/search/?searchable={{ $searchIn }}&field={{ $searchBy }}"
-            default-value="{{ (int) optional($field->value())->getKey() }}"
+        name="{{ $field->name() }}"
+        data-url="{{ $searchUrl }}"
+        default-value="{{ optional($field->value())->getKey() }}"
     ></instant-search>
 @endif
diff --git a/publishes/views/fields/enum/edit.blade.php b/publishes/views/fields/enum/edit.blade.php
index e6bf612..d286aa7 100644
--- a/publishes/views/fields/enum/edit.blade.php
+++ b/publishes/views/fields/enum/edit.blade.php
@@ -1 +1,7 @@
-{!! Form::select($field->name(), $options, $field->value(), $attributes) !!}
\ No newline at end of file
+@if ('datalist' === $field->type)
+    {!! Form::text($field->name(), $field->value(), ['id' => $field->id(), 'class' => 'form-control', 'list' => "scaffold_{$field->id()}"]) !!}
+    {!! Form::datalist("scaffold_{$field->id()}", $field->options) !!}
+@else
+    {{ Form::select($field->name(), $field->options ?? [], $field->value(), ['class' => 'form-control', 'multiple' => $field->isArray] + $field->getAttributes()) }}
+@endif
+
diff --git a/publishes/views/fields/enum/index.blade.php b/publishes/views/fields/enum/index.blade.php
index d5aefb1..20c95c0 100644
--- a/publishes/views/fields/enum/index.blade.php
+++ b/publishes/views/fields/enum/index.blade.php
@@ -1,3 +1,3 @@
 <span {!! ($color ? "class=\"label\" style=\"background-color: $color\"" : "" ) !!} >
-    {{ ($field->value() ? \Illuminate\Support\Arr::get($options, $field->value()) : '---') }}
+    {{ ($field->value() ? \Illuminate\Support\Arr::get($field->options, $field->value()) : '---') }}
 </span>
diff --git a/publishes/views/fields/has_many/edit.blade.php b/publishes/views/fields/has_many/edit.blade.php
index c0d6e67..6da79c7 100644
--- a/publishes/views/fields/has_many/edit.blade.php
+++ b/publishes/views/fields/has_many/edit.blade.php
@@ -1 +1 @@
-asfa
\ No newline at end of file
+<span class="warning">Not implemented</span>
diff --git a/publishes/views/fields/has_many/index.blade.php b/publishes/views/fields/has_many/index.blade.php
index da5014e..44f9617 100644
--- a/publishes/views/fields/has_many/index.blade.php
+++ b/publishes/views/fields/has_many/index.blade.php
@@ -2,10 +2,10 @@
     <span class="label label-success">
         @if ($url)
             <a href="{{ $url }}" style="color: white;">
-                <i class="fa fa-{{ $icon }}"></i>&nbsp;{{ $count }}
+                <i class="fa fa-{{ $field->icon }}"></i>&nbsp;{{ $count }}
             </a>
         @else
-            <i class="fa fa-{{ $icon }}"></i>&nbsp;{{ $count }}
+            <i class="fa fa-{{ $field->icon }}"></i>&nbsp;{{ $count }}
         @endif
     </span>
-@endif
\ No newline at end of file
+@endif
diff --git a/publishes/views/fields/media/edit.blade.php b/publishes/views/fields/media/edit.blade.php
index f0e2231..0c26901 100644
--- a/publishes/views/fields/media/edit.blade.php
+++ b/publishes/views/fields/media/edit.blade.php
@@ -2,7 +2,7 @@
         id="{{ $field->id() }}"
         :has-indicators="true"
         :readonly="false"
-        conversion="{{ $conversion ?? 'default' }}"
+        conversion="{{ $field->conversion ?? 'default' }}"
         :media="{{ $media }}"
         :width="320"
 ></media-carousel>
diff --git a/publishes/views/fields/media/view.blade.php b/publishes/views/fields/media/view.blade.php
index 668565d..a5125ce 100644
--- a/publishes/views/fields/media/view.blade.php
+++ b/publishes/views/fields/media/view.blade.php
@@ -5,6 +5,6 @@
 
 <media-library
         id="{{ $field->id() }}"
-        collection="{{ ($collection ?? 'default') }}"
+        collection="{{ ($field->collection ?? 'default') }}"
         endpoint="{{ $endpoint }}"
-></media-library>
\ No newline at end of file
+></media-library>
diff --git a/publishes/views/fields/radio/edit.blade.php b/publishes/views/fields/radio/edit.blade.php
index 315d8a6..7b215be 100644
--- a/publishes/views/fields/radio/edit.blade.php
+++ b/publishes/views/fields/radio/edit.blade.php
@@ -1,4 +1,4 @@
-@foreach($options as $optionValue => $optionLabel)
+@foreach($field->options as $optionValue => $optionLabel)
     <label for="{{ $id = \Illuminate\Support\Str::slug($field->id().'-'.$optionValue) }}" style="margin-right: 10px;">
         {!! Form::radio($field->name(), $optionValue, null, ['id' => $id]) !!}
         <span>{{ $optionLabel }}</span>
diff --git a/publishes/views/fields/text/edit.blade.php b/publishes/views/fields/text/edit.blade.php
index e1b8075..895129e 100644
--- a/publishes/views/fields/text/edit.blade.php
+++ b/publishes/views/fields/text/edit.blade.php
@@ -1 +1 @@
-{!! Form::text($field->name(), $field->value(), $attributes) !!}
\ No newline at end of file
+{!! Form::text($field->name(), $field->value(), $attributes) !!}
diff --git a/publishes/views/filters/enum.blade.php b/publishes/views/filters/enum.blade.php
index 4063256..5740f86 100644
--- a/publishes/views/filters/enum.blade.php
+++ b/publishes/views/filters/enum.blade.php
@@ -1 +1,7 @@
-{{ Form::select($field->name(), ['' => "&mdash;"] + ($options ?? []), $field->value(), ['class' => 'form-control']) }}
\ No newline at end of file
+@if ('datalist' === $field->type)
+    {!! Form::text($field->name(), $field->value(), ['id' => $field->id(), 'class' => 'form-control', 'list' => "scaffold_{$field->id()}"]) !!}
+    {!! Form::datalist("scaffold_{$field->id()}", $field->options) !!}
+@else
+    {{ Form::select($field->name(), ($field->isArray ? [] : ['' => "&mdash;"]) + ($field->options ?? []), $field->value(), ['class' => 'form-control', 'multiple' => $field->isArray] + $attributes) }}
+@endif
+
diff --git a/publishes/views/filters/number.blade.php b/publishes/views/filters/number.blade.php
index de36aae..6697a34 100644
--- a/publishes/views/filters/number.blade.php
+++ b/publishes/views/filters/number.blade.php
@@ -1 +1 @@
-{{ Form::number($field->name(), $field->value(), ['class' => 'form-control']) }}
\ No newline at end of file
+{{ Form::number($field->name(), $field->value(), ['class' => 'form-control'] + $attributes) }}
diff --git a/publishes/views/layouts/print.blade.php b/publishes/views/layouts/print.blade.php
new file mode 100755
index 0000000..a45e818
--- /dev/null
+++ b/publishes/views/layouts/print.blade.php
@@ -0,0 +1,28 @@
+@inject('config', 'scaffold.config')
+
+    <!DOCTYPE html>
+<html lang="en">
+<head ng-app="Architector">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+
+    <title>
+        {{ strip_tags($config->get('title')) }}
+        @if (isset($resource) && ($title = $resource->title()))
+            &raquo; {{ $title }}
+        @endif
+    </title>
+
+    @include('administrator::partials.styles')
+    @stack('scaffold.css')
+    <link rel="stylesheet" href="{{ mix('print.css', 'admin') }}">
+</head>
+<body style="background: white">
+<div id="app">
+    <div class="contentpanel">
+        @yield('scaffold.content')
+    </div>
+</div>
+</body>
+</html>
diff --git a/publishes/views/view/model.blade.php b/publishes/views/view/model.blade.php
index 3a93267..2373e12 100755
--- a/publishes/views/view/model.blade.php
+++ b/publishes/views/view/model.blade.php
@@ -30,7 +30,9 @@
             {!! $element->render(\Terranet\Administrator\Scaffolding::PAGE_VIEW) !!}
         @else
             @component('administrator::components.table.row')
-                @slot('label', Form::label($element->id(), $element->title()))
+                @if(!$element->isHiddenLabel())
+                    @slot('label', Form::label($element->id(), $element->title()))
+                @endif
                 @slot('description', $element->getDescription())
                 @slot('input', $element->render(\Terranet\Administrator\Scaffolding::PAGE_VIEW))
             @endcomponent
diff --git a/src/AdminRequest.php b/src/AdminRequest.php
index 457a959..adfe24c 100644
--- a/src/AdminRequest.php
+++ b/src/AdminRequest.php
@@ -19,20 +19,6 @@ public function rules()
         return [];
     }
 
-    /**
-     * Resolve resource based on router parameters.
-     *
-     * @return null|Module
-     */
-    public function resource(): ?Module
-    {
-        return once(function () {
-            return tap(Architect::resourceForKey($this->route()->parameter('module')), function ($resource) {
-                abort_if(is_null($resource), 404);
-            });
-        });
-    }
-
     /**
      * Resolve current model.
      *
@@ -42,14 +28,29 @@ public function resource(): ?Module
     public function resolveModel($id): ?Model
     {
         return once(function () use ($id) {
-            /** @var Finder $finder */
-            $finder = $this->resource()->finder();
+            if ($item = app('scaffold.model')) {
+                return $item;
+            }
 
-            if ($finder) {
+            if ($finder = $this->resource()->finder()) {
                 abort_unless($item = $finder->find($id), 404);
             }
 
             return $item ?? null;
         });
     }
+
+    /**
+     * Resolve resource based on router parameters.
+     *
+     * @return null|Module
+     */
+    public function resource(): ?Module
+    {
+        return once(function () {
+            return tap(Architect::resourceForKey($this->route()->parameter('module')), function ($resource) {
+                abort_if(is_null($resource), 404);
+            });
+        });
+    }
 }
diff --git a/src/Collection/Mutable.php b/src/Collection/Mutable.php
index 6d8f0f7..e8975fb 100755
--- a/src/Collection/Mutable.php
+++ b/src/Collection/Mutable.php
@@ -12,73 +12,134 @@
 class Mutable extends BaseCollection
 {
     /**
-     * Add an element to the collection.
+     * Retrieve only visible items.
      *
-     * @param mixed $element
-     * @param Closure $callback
-     * @return $this
+     * @param string $page
+     * @return Mutable
      */
-    public function add($element, Closure $callback = null)
+    public function visibleOnPage(string $page)
     {
-        $element = $this->createElement($element);
+        return $this->filter(function ($item) use ($page) {
+            // @var Generic|Translatable $item
+            return (($item instanceof Group) || $item->isVisibleOnPage($page)) && $item->visibleWhen();
+        });
+    }
 
-        if ($callback) {
-            $callback($element);
+    /**
+     * Replace the field.
+     *
+     * @param mixed $id
+     * @param $value
+     * @return $this|BaseCollection
+     * @throws Exception
+     */
+    public function switch($id, $value)
+    {
+        if ($position = $this->position($id)) {
+            $this->offsetSet($position, $value);
         }
 
-        parent::add($element);
-
         return $this;
     }
 
     /**
-     * Insert an element into collection at specified position.
+     * Find an element position.
      *
-     * @param $element
-     * @param $position
-     * @param  null|Closure  $callback
-     * @return $this
+     * @param string $id
+     * @return null|int|string
      * @throws Exception
      */
-    public function insert($element, $position, Closure $callback = null): self
+    public function position(string $id): int
     {
-        $element = $this->createElement($element);
+        $i = 0;
+        foreach ($this->all() as $item) {
+            if ($item->id() === $id) {
+                return $i;
+            }
 
-        if ($callback) {
-            $callback($element);
+            ++$i;
         }
 
-        if (\is_string($position)) {
-            $this->add($element);
+        return $this->notFound($id);
+    }
 
-            return $this->move($element->id(), $position);
-        }
+    /**
+     * @param string $id
+     * @throws Exception
+     */
+    protected function notFound(string $id)
+    {
+        throw new Exception(sprintf('Element [%s] does not exist.', $id));
+    }
 
-        if ($position >= $this->count()) {
-            return $this->add($element);
+    /**
+     * Update many elements at once.
+     *
+     * @param array $ids
+     * @return $this
+     * @throws Exception
+     */
+    public function updateMany(array $ids = []): self
+    {
+        foreach ($ids as $id => $callback) {
+            $this->update($id, $callback);
         }
 
-        if (0 === $position) {
-            return $this->prepend($element);
+        return $this;
+    }
+
+    /**
+     * Update elements behaviour.
+     *
+     * @param string $id
+     * @param Closure $callback
+     * @return $this
+     * @throws Exception
+     */
+    public function update(string $id, Closure $callback): self
+    {
+        if (Str::contains($id, ',')) {
+            collect(explode(',', $id))
+                ->map('trim')
+                ->each(function ($element) use ($callback) {
+                    $this->update($element, $callback);
+                });
+
+            return $this;
         }
 
-        $items = [];
-        foreach ($this->all() as $index => $value) {
-            if ($index === $position) {
-                array_push($items, $element);
-            }
+        $element = $this->find($id);
 
-            array_push($items, $value);
+        if ($element && $callback) {
+            $newElement = $callback($element);
+            if ($newElement !== $element) {
+                $position = $this->position($id);
+                $this->except($id);
+                $this->insert($newElement, $position);
+            }
         }
-        $this->items = $items;
 
         return $this;
     }
 
+    /**
+     * Find an element.
+     *
+     * @param string $id
+     * @return mixed
+     * @throws Exception
+     */
+    public function find(string $id)
+    {
+        return $this->first(function ($element) use ($id) {
+            return $element && $element->id() === $id;
+        });
+    }
+
     /**
      * Get all items except for those with the specified keys.
      *
-     * @param  array|mixed|string  $keys
+     * @param array|mixed|string $keys
      * @return static
      */
     public function except($keys)
@@ -99,83 +160,81 @@ public function except($keys)
     }
 
     /**
-     * Retrieve only visible items.
-     *
-     * @param  string  $page
-     * @return Mutable
-     */
-    public function visibleOnPage(string $page)
-    {
-        return $this->filter(function ($item) use ($page) {
-            // @var Generic|Translatable $item
-            return (($item instanceof Group) || $item->isVisibleOnPage($page)) && $item->visibleWhen();
-        });
-    }
-
-    /**
-     * Update elements behaviour.
+     * Insert an element into collection at specified position.
      *
-     * @param  string  $id
-     * @param  Closure  $callback
+     * @param $element
+     * @param $position
+     * @param null|Closure $callback
      * @return $this
      * @throws Exception
      */
-    public function update(string $id, Closure $callback): self
+    public function insert($element, $position, Closure $callback = null): self
     {
-        if (Str::contains($id, ',')) {
-            collect(explode(',', $id))
-                ->map('trim')
-                ->each(function ($element) use ($callback) {
-                    $this->update($element, $callback);
-                });
+        $element = $this->createElement($element);
 
-            return $this;
+        if ($callback) {
+            $callback($element);
         }
 
-        $element = $this->find($id);
+        if (\is_string($position)) {
+            $this->add($element);
 
-        if ($element && $callback) {
-            $newElement = $callback($element);
-            if ($newElement !== $element) {
-                $position = $this->position($id);
-                $this->except($id);
-                $this->insert($newElement, $position);
+            return $this->move($element->id(), $position);
+        }
+
+        if ($position >= $this->count()) {
+            return $this->add($element);
+        }
+
+        if (0 === $position) {
+            return $this->prepend($element);
+        }
+
+        $items = [];
+        foreach ($this->all() as $index => $value) {
+            if ($index === $position) {
+                array_push($items, $element);
             }
+
+            array_push($items, $value);
         }
+        $this->items = $items;
 
         return $this;
     }
 
     /**
-     * Replace the field.
+     * Create element object from string.
      *
-     * @param  mixed  $id
-     * @param $value
-     * @return $this|BaseCollection
-     * @throws Exception
+     * @param $element
+     * @return mixed
      */
-    public function switch($id, $value)
+    protected function createElement($element)
     {
-        if ($position = $this->position($id)) {
-            $this->offsetSet($position, $value);
+        if (\is_string($element)) {
+            $element = Text::make($element, $element);
         }
 
-        return $this;
+        return $element;
     }
 
     /**
-     * Update many elements at once.
+     * Add an element to the collection.
      *
-     * @param  array  $ids
+     * @param mixed $element
+     * @param Closure $callback
      * @return $this
-     * @throws Exception
      */
-    public function updateMany(array $ids = []): self
+    public function add($element, Closure $callback = null)
     {
-        foreach ($ids as $id => $callback) {
-            $this->update($id, $callback);
+        $element = $this->createElement($element);
+
+        if ($callback) {
+            $callback($element);
         }
 
+        parent::add($element);
+
         return $this;
     }
 
@@ -183,7 +242,7 @@ public function updateMany(array $ids = []): self
      * Move element.
      *
      * @param $id
-     * @param  int|mixed|string  $position
+     * @param int|mixed|string $position
      * @return static
      * @throws Exception
      * @example: move('user_id', 4);
@@ -207,10 +266,27 @@ public function move(string $id, $position): self
         throw new Exception("Unknown moving direction: {$position}");
     }
 
+    /**
+     * Move an element to a position.
+     *
+     * @param string $id
+     * @param int|string $position
+     * @return static
+     * @throws Exception
+     */
+    protected function toPosition(string $id, $position): self
+    {
+        $element = $this->find($id);
+
+        return $this
+            ->except($id)
+            ->insert($element, $position);
+    }
+
     /**
      * Move element before another one.
      *
-     * @param  string  $id
+     * @param string $id
      * @param $target
      * @return $this
      * @throws Exception
@@ -232,7 +308,7 @@ public function moveBefore(string $id, $target)
     /**
      * Move element after another one.
      *
-     * @param  string  $id
+     * @param string $id
      * @param $target
      * @return $this
      * @throws Exception
@@ -252,11 +328,32 @@ public function moveAfter(string $id, $target): self
         return $this;
     }
 
+    /**
+     * @param $elements
+     * @example: [1 => 'name', 'gender', 'age' => 'after:gender', 'other' => 3]
+     */
+    public function setOrder(array $elements = []): self
+    {
+        foreach ($elements as $key => $value) {
+            if (is_numeric($key)) {
+                $position = $key;
+                $field = $value;
+            } else {
+                $position = $value;
+                $field = $key;
+            }
+
+            $this->move($field, $position);
+        }
+
+        return $this;
+    }
+
     /**
      * Add a new elements group.
      *
-     * @param  string  $id
-     * @param  Closure  $callback
+     * @param string $id
+     * @param Closure $callback
      * @return $this
      */
     public function group(string $id, Closure $callback): self
@@ -273,9 +370,9 @@ public function group(string $id, Closure $callback): self
     /**
      * Join existing elements to a group.
      *
-     * @param  array  $elements
-     * @param  string  $groupId
-     * @param  null|int|string  $position
+     * @param array $elements
+     * @param string $groupId
+     * @param null|int|string $position
      * @return $this
      * @throws Exception
      */
@@ -283,11 +380,9 @@ public function stack(array $elements, string $groupId, $position = null): self
     {
         $group = new Group($groupId);
 
-        $this->filter(function ($element) use ($elements) {
-            return \in_array($element->id(), $elements, true);
-        })->each(function ($element) use ($group) {
-            $group->push($element);
-            $this->items = $this->except($element->id())->all();
+        collect($elements)->each(function ($id) use ($group) {
+            $group->push($this->find($id));
+            $this->items = $this->except($id)->all();
         });
 
         if ($position) {
@@ -320,46 +415,11 @@ public function build($decorator)
         });
     }
 
-    /**
-     * Find an element.
-     *
-     * @param  string  $id
-     * @return mixed
-     * @throws Exception
-     */
-    public function find(string $id)
-    {
-        return $this->first(function ($element) use ($id) {
-            return $element && $element->id() === $id;
-        });
-    }
-
-    /**
-     * Find an element position.
-     *
-     * @param  string  $id
-     * @return null|int|string
-     * @throws Exception
-     */
-    public function position(string $id): int
-    {
-        $i = 0;
-        foreach ($this->all() as $item) {
-            if ($item->id() === $id) {
-                return $i;
-            }
-
-            ++$i;
-        }
-
-        return $this->notFound($id);
-    }
-
     /**
      * Make elements sortable.
      *
-     * @param  mixed string|array $keys
-     * @param  \Closure  $callback
+     * @param mixed string|array $keys
+     * @param \Closure $callback
      * @return Mutable
      * @example: sortable(['title' => function($query) {  }])
      * @example: sortable(['title'])
@@ -389,7 +449,7 @@ public function sortable($keys, \Closure $callback = null)
     /**
      * Remove column from Sortable collection.
      *
-     * @param  array|string  $keys
+     * @param array|string $keys
      * @return self
      */
     public function disableSorting($keys): self
@@ -407,45 +467,4 @@ public function disableSorting($keys): self
 
         return $this;
     }
-
-    /**
-     * Move an element to a position.
-     *
-     * @param  string  $id
-     * @param  int|string  $position
-     * @return static
-     * @throws Exception
-     */
-    protected function toPosition(string $id, $position): self
-    {
-        $element = $this->find($id);
-
-        return $this
-            ->except($id)
-            ->insert($element, $position);
-    }
-
-    /**
-     * @param  string  $id
-     * @throws Exception
-     */
-    protected function notFound(string $id)
-    {
-        throw new Exception(sprintf('Element [%s] does not exist.', $id));
-    }
-
-    /**
-     * Create element object from string.
-     *
-     * @param $element
-     * @return mixed
-     */
-    protected function createElement($element)
-    {
-        if (\is_string($element)) {
-            $element = Text::make($element, $element);
-        }
-
-        return $element;
-    }
 }
diff --git a/src/Contracts/Module/Navigable.php b/src/Contracts/Module/Navigable.php
index bc4f6cd..e08981e 100755
--- a/src/Contracts/Module/Navigable.php
+++ b/src/Contracts/Module/Navigable.php
@@ -2,6 +2,8 @@
 
 namespace Terranet\Administrator\Contracts\Module;
 
+use Illuminate\Http\Request;
+
 interface Navigable
 {
     /** @var string */
@@ -37,7 +39,7 @@ public function navigableParams(): array;
      *
      * @return mixed
      */
-    public function showIf();
+    public function showIf(Request $request);
 
     /**
      * Add resource to navigation as link or header.
diff --git a/src/Field/BelongsTo.php b/src/Field/BelongsTo.php
index 6c72eed..c2a07e3 100644
--- a/src/Field/BelongsTo.php
+++ b/src/Field/BelongsTo.php
@@ -7,19 +7,23 @@
 use Illuminate\Support\Str;
 use Terranet\Administrator\Architect;
 use Terranet\Administrator\Field\Traits\HandlesRelation;
+use Terranet\Administrator\Field\Traits\HasEmptyValue;
 
 class BelongsTo extends Field
 {
-    use HandlesRelation;
+    use HandlesRelation, HasEmptyValue;
 
     /** @var string */
-    protected $column = 'name';
+    public $column = 'name';
 
     /** @var bool */
-    protected $searchable = true;
+    public $searchable = true;
+
+    /** @var string */
+    public $searchUrl;
 
     /**
-     * @param  string  $column
+     * @param string $column
      * @return self
      */
     public function useForTitle(string $column): self
@@ -30,15 +34,7 @@ public function useForTitle(string $column): self
     }
 
     /**
-     * @return string
-     */
-    public function getColumn()
-    {
-        return $this->column;
-    }
-
-    /**
-     * @param  bool  $flag
+     * @param bool $flag
      * @return $this
      */
     public function searchable(bool $flag = false)
@@ -60,9 +56,9 @@ public function name(): string
     }
 
     /**
-     * @param  Builder  $query
-     * @param  Model  $model
-     * @param  string  $direction
+     * @param Builder $query
+     * @param Model $model
+     * @param string $direction
      * @return Builder
      * @throws \Exception
      */
@@ -81,6 +77,29 @@ public function sortBy(Builder $query, Model $model, string $direction): Builder
             ->orderBy("{$alias}.{$foreignColumn}", $direction);
     }
 
+    /**
+     * @return string
+     */
+    public function getColumn()
+    {
+        return $this->column;
+    }
+
+    public function dataUrl($url)
+    {
+        $this->searchUrl = $url;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    protected function onView(): array
+    {
+        return $this->onIndex();
+    }
+
     /**
      * @return array
      */
@@ -98,14 +117,6 @@ protected function onIndex(): array
         ];
     }
 
-    /**
-     * @return array
-     */
-    protected function onView(): array
-    {
-        return $this->onIndex();
-    }
-
     /**
      * @return array
      */
@@ -128,12 +139,26 @@ protected function onEdit(): array
             }
         }
 
+        if ($this->allowEmpty) {
+            $options = ['' => '---'] + $options;
+        }
+
         return [
             'options' => $options ?? [],
             'related' => $related ?? null,
-            'searchIn' => isset($related) ? get_class($related) : null,
+            'searchIn' => $searchIn = isset($related) ? get_class($related) : null,
             'searchable' => $this->searchable,
-            'searchBy' => $this->column,
+            'searchBy' => $searchBy = $this->column,
+            'searchUrl' => $this->searchUrl($searchIn, $searchBy),
         ];
     }
+
+    protected function searchUrl(string $searchIn, string $searchBy)
+    {
+        return $this->searchUrl ?? strtr('/{path}/search/?searchable={searchIn}&field={searchBy}', [
+                '{path}' => \Terranet\Administrator\Architect::path(),
+                '{searchIn}' => $searchIn,
+                '{searchBy}' => $searchBy,
+            ]);
+    }
 }
diff --git a/src/Field/BelongsToMany.php b/src/Field/BelongsToMany.php
index 298e38e..7f9f069 100644
--- a/src/Field/BelongsToMany.php
+++ b/src/Field/BelongsToMany.php
@@ -8,16 +8,16 @@ class BelongsToMany extends HasMany
     const MODE_CHECKBOXES = 'checkboxes';
 
     /** @var string */
-    protected $icon = 'random';
+    public $icon = 'random';
 
     /** @var string */
-    protected $titleField = 'name';
+    public $titleField = 'name';
 
     /** @var string */
-    protected $editMode = self::MODE_CHECKBOXES;
+    public $editMode = self::MODE_CHECKBOXES;
 
     /** @var bool */
-    protected $completeList = true;
+    public $completeList = true;
 
     /**
      * Show editable controls as checkboxes.
diff --git a/src/Field/Boolean.php b/src/Field/Boolean.php
index 38397df..7afc29d 100644
--- a/src/Field/Boolean.php
+++ b/src/Field/Boolean.php
@@ -5,17 +5,17 @@
 class Boolean extends Field
 {
     /** @var mixed */
-    protected $trueValue = true;
+    public $trueValue = true;
 
     /** @var mixed */
-    protected $falseValue = false;
+    public $falseValue = false;
 
     /**
      * @param $value
      *
      * @return $this
      */
-    public function trueValue($value)
+    public function trueValue($value): self
     {
         $this->trueValue = $value;
 
@@ -27,7 +27,7 @@ public function trueValue($value)
      *
      * @return $this
      */
-    public function falseValue($value)
+    public function falseValue($value): self
     {
         $this->falseValue = $value;
 
@@ -37,7 +37,7 @@ public function falseValue($value)
     /**
      * @return bool
      */
-    public function isTrue()
+    public function isTrue(): bool
     {
         return $this->value() === $this->trueValue;
     }
@@ -45,7 +45,7 @@ public function isTrue()
     /**
      * @return array
      */
-    public function onIndex()
+    public function onIndex(): array
     {
         return ['isTrue' => $this->isTrue()];
     }
@@ -53,7 +53,7 @@ public function onIndex()
     /**
      * @return array
      */
-    public function onView()
+    public function onView(): array
     {
         return $this->onIndex();
     }
diff --git a/src/Field/DateTime.php b/src/Field/DateTime.php
index 5edf78e..e5cdf0d 100644
--- a/src/Field/DateTime.php
+++ b/src/Field/DateTime.php
@@ -7,13 +7,13 @@
 class DateTime extends Field
 {
     /** @var string */
-    protected $dateFormat = 'M j, Y';
+    public $dateFormat = 'M j, Y';
 
     /** @var string */
-    protected $timeFormat = 'g:i A';
+    public $timeFormat = 'g:i A';
 
     /** @var string */
-    protected $dateTimeFormat = 'M j, Y g:i A';
+    public $dateTimeFormat = 'M j, Y g:i A';
 
     /**
      * @return array
@@ -24,7 +24,7 @@ public function onIndex(): array
             self::class => $this->dateTimeFormat,
             Date::class => $this->dateFormat,
             Time::class => $this->timeFormat,
-        ][\get_class($this)];
+        ][get_class($this)];
 
         $formattedValue = Carbon::parse($this->value())->format($format);
 
@@ -48,7 +48,7 @@ public function onView(): array
      */
     public function setDateTimeFormat(string $format): self
     {
-        $this->$dateTimeFormat = $format;
+        $this->dateTimeFormat = $format;
 
         return $this;
     }
diff --git a/src/Field/Email.php b/src/Field/Email.php
index c32560e..e8faedb 100644
--- a/src/Field/Email.php
+++ b/src/Field/Email.php
@@ -7,10 +7,8 @@ class Email extends Field
     /**
      * @return array
      */
-    public function getAattributes(): array
+    public function getAttributes(): array
     {
-        return parent::getAttributes() + [
-                'style' => 'width: 250px',
-            ];
+        return ['style' => 'width: 250px'] + parent::getAttributes();
     }
 }
diff --git a/src/Field/Enum.php b/src/Field/Enum.php
index add1979..a3d838e 100644
--- a/src/Field/Enum.php
+++ b/src/Field/Enum.php
@@ -5,25 +5,28 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use Terranet\Administrator\Exception;
+use Terranet\Administrator\Traits\Form\SupportsListTypes;
 
 class Enum extends Field
 {
+    use SupportsListTypes;
+
     /** @var array */
-    protected $options = [];
+    public $options = [];
 
     /** @var array */
-    protected $colors = ['#777777', '#2574ab', '#259dab', '#5bc0de', '#e6ad5c', '#d9534f'];
+    public $colors = ['#777777', '#2574ab', '#259dab', '#5bc0de', '#e6ad5c', '#d9534f'];
 
     /** @var array */
-    protected $palette = [];
+    public $palette = [];
 
     /** @var bool */
-    protected $useColors = true;
+    public $useColors = true;
 
     /**
      * @return $this
      */
-    public function disableColors()
+    public function disableColors(): self
     {
         $this->useColors = false;
 
@@ -31,7 +34,7 @@ public function disableColors()
     }
 
     /**
-     * @param  iterable  $options
+     * @param iterable $options
      * @return self
      */
     public function setOptions(iterable $options): self
@@ -55,8 +58,8 @@ public function setOptions(iterable $options): self
     /**
      * Set colors palette.
      *
-     * @param  mixed  $color
-     * @param  null|string  $value
+     * @param mixed $color
+     * @param null|string $value
      * @return Enum
      * @throws Exception
      */
@@ -82,26 +85,25 @@ public function palette($color, string $value = null)
     /**
      * @return array
      */
-    protected function onEdit()
+    protected function onIndex(): array
     {
-        return [
-            'options' => $this->options ?: [],
-            'color' => $this->useColors && $this->value() ? \Illuminate\Support\Arr::get($this->palette, $this->value()) : null,
-        ];
+        return $this->onEdit();
     }
 
     /**
      * @return array
      */
-    protected function onIndex()
+    protected function onEdit(): array
     {
-        return $this->onEdit();
+        $color = $this->useColors && $this->value() ? Arr::get($this->palette, $this->value()) : null;
+
+        return compact('color');
     }
 
     /**
      * @return array
      */
-    protected function onView()
+    protected function onView(): array
     {
         return $this->onEdit();
     }
diff --git a/src/Field/Field.php b/src/Field/Field.php
index 2e4f91c..6813211 100644
--- a/src/Field/Field.php
+++ b/src/Field/Field.php
@@ -2,6 +2,7 @@
 
 namespace Terranet\Administrator\Field;
 
+use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\View;
@@ -13,51 +14,54 @@
 use Terranet\Administrator\Field\Traits\AppliesSorting;
 use Terranet\Administrator\Field\Traits\HandlesVisibility;
 use Terranet\Administrator\Field\Traits\HasValuePresenter;
+use Terranet\Administrator\Field\Traits\SupportsMultipleValues;
 use Terranet\Administrator\Scaffolding;
 use Terranet\Administrator\Traits\AutoTranslatesInstances;
+use Terranet\Administrator\Traits\Form\HasHtmlAttributes;
 
 abstract class Field implements Sortable, AutoTranslatable
 {
-    use AcceptsCustomFormat, AppliesSorting, AutoTranslatesInstances, HasValuePresenter, HandlesVisibility;
+    use AcceptsCustomFormat,
+        AppliesSorting,
+        AutoTranslatesInstances,
+        HasValuePresenter,
+        HandlesVisibility,
+        HasHtmlAttributes,
+        SupportsMultipleValues;
 
     /** @var string */
-    protected $id;
+    public $id;
 
     /** @var string */
-    protected $title;
+    public $title;
 
     /** @var string */
-    protected $name;
+    public $name;
 
     /** @var mixed */
-    protected $value;
+    public $value;
 
     /** @var string */
-    protected $description;
+    public $description;
 
     /** @var Model */
-    protected $model;
+    public $model;
 
     /** @var bool */
-    protected $showLabel = true;
+    public $showLabel = true;
 
     /** @var array */
-    protected $visibility = [
+    public $visibility = [
         Scaffolding::PAGE_INDEX => true,
         Scaffolding::PAGE_EDIT => true,
         Scaffolding::PAGE_VIEW => true,
     ];
 
-    /** @var array */
-    protected $attributes = [
-        'class' => 'form-control',
-    ];
-
     /**
      * Field constructor.
      *
-     * @param  string  $title
-     * @param  null|string  $id
+     * @param string $title
+     * @param null|string $id
      */
     private function __construct(string $title, string $id = null)
     {
@@ -76,13 +80,74 @@ private function __construct(string $title, string $id = null)
         }
     }
 
+    /**
+     * @param string $id
+     * @return static
+     */
+    public function setId(string $id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function translationKey(): string
+    {
+        $key = sprintf('administrator::columns.%s.%s', $this->translatableModule()->url(), $this->id);
+
+        if (!trans()->has($key)) {
+            $key = sprintf('administrator::columns.%s.%s', 'global', $this->id);
+        }
+
+        return $key;
+    }
+
+    /**
+     * @param string $title
+     * @return static
+     */
+    public function setTitle(string $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function descriptionKey(): string
+    {
+        $key = sprintf('administrator::hints.%s.%s', $this->translatableModule()->url(), $this->id);
+
+        if (!trans()->has($key)) {
+            $key = sprintf('administrator::hints.%s.%s', 'global', $this->id);
+        }
+
+        return $key;
+    }
+
+    /**
+     * Create new element from another.
+     *
+     * @param Field $element
+     * @return static
+     */
+    public static function makeFrom(self $element): self
+    {
+        return static::make($element->title(), $element->id());
+    }
+
     /**
      * @param $title
-     * @param  null  $id
-     * @param  \Closure  $callback
+     * @param null $id
+     * @param Closure|null $callback
      * @return static
      */
-    public static function make($title, $id = null, \Closure $callback = null): self
+    public static function make($title, $id = null, Closure $callback = null): self
     {
         $instance = new static($title, $id);
 
@@ -94,20 +159,29 @@ public static function make($title, $id = null, \Closure $callback = null): self
     }
 
     /**
-     * Create new element from another.
+     * Return Element title.
      *
-     * @param  Field  $element
-     * @return static
+     * @return string
      */
-    public static function makeFrom(self $element): self
+    public function title(): string
     {
-        return static::make($element->title(), $element->id());
+        return $this->title;
+    }
+
+    /**
+     * Return Element ID.
+     *
+     * @return string
+     */
+    public function id(): string
+    {
+        return $this->id;
     }
 
     /**
      * Switch to a new element type.
      *
-     * @param  string  $className
+     * @param string $className
      * @return mixed
      */
     public function switchTo(string $className)
@@ -116,33 +190,33 @@ public function switchTo(string $className)
     }
 
     /**
-     * @param  Model  $model
-     * @return static
+     * @return Model
      */
-    public function setModel(Model $model): self
+    public function getModel(): ?Model
     {
-        $this->model = $model;
-
-        return $this;
+        return $this->model;
     }
 
     /**
-     * @return Model
+     * @param Model $model
+     * @return static
      */
-    public function getModel()
+    public function setModel(Model $model): self
     {
-        return $this->model;
+        $this->model = $model;
+
+        return $this;
     }
 
     /**
      * Render Element.
      *
-     * @param  string  $page
+     * @param string $page
      * @return mixed
      */
     final public function render(string $page = 'index')
     {
-        if (\in_array($page, [Scaffolding::PAGE_INDEX, Scaffolding::PAGE_VIEW], true)) {
+        if (in_array($page, [Scaffolding::PAGE_INDEX, Scaffolding::PAGE_VIEW], true)) {
             if ($this->hasCustomFormat()) {
                 return $this->callFormatter($this->model, $page);
             }
@@ -159,7 +233,7 @@ final public function render(string $page = 'index')
         ];
 
         if (method_exists($this, $dataGetter = 'on'.Str::title($page))) {
-            $data += \call_user_func([$this, $dataGetter]);
+            $data += call_user_func([$this, $dataGetter]);
         }
 
         if (View::exists($view = $this->template($page))) {
@@ -170,13 +244,25 @@ final public function render(string $page = 'index')
     }
 
     /**
-     * Return Element ID.
-     *
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * @param string $page
+     * @param string|null $field
      * @return string
      */
-    public function id(): string
+    protected function template(string $page, string $field = null): string
     {
-        return $this->id;
+        return sprintf(
+            'administrator::fields.%s.%s',
+            Str::snake($field ?? class_basename($this)),
+            $page
+        );
     }
 
     /**
@@ -189,9 +275,9 @@ public function name(): string
         if (null === $this->name) {
             $parts = explode('.', $this->id());
 
-            if (\count($parts) > 1) {
+            if (count($parts) > 1) {
                 $first = Arr::first($parts);
-                $other = \array_slice($parts, 1);
+                $other = array_slice($parts, 1);
 
                 $other = array_map(function ($part) {
                     return "[$part]";
@@ -200,14 +286,14 @@ public function name(): string
                 return $this->name = implode('', array_merge([$first], $other));
             }
 
-            return $this->name = $this->id();
+            return $this->name = $this->id().($this->isArray ?? false ? '[]' : '');
         }
 
         return $this->name;
     }
 
     /**
-     * @param  string  $name
+     * @param string $name
      * @return Field
      */
     public function setName(string $name): self
@@ -217,27 +303,6 @@ public function setName(string $name): self
         return $this;
     }
 
-    /**
-     * @param  string  $id
-     * @return static
-     */
-    public function setId(string $id): self
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * Return Element title.
-     *
-     * @return string
-     */
-    public function title(): string
-    {
-        return $this->title;
-    }
-
     /**
      * @return string
      */
@@ -247,18 +312,7 @@ public function getDescription(): ?string
     }
 
     /**
-     * @param  string  $title
-     * @return static
-     */
-    public function setTitle(string $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    /**
-     * @param  null|string  $description
+     * @param null|string $description
      * @return static
      */
     public function setDescription(?string $description): self
@@ -273,13 +327,13 @@ public function setDescription(?string $description): self
      *
      * @return Translatable
      */
-    public function translatable()
+    public function translatable(): Translatable
     {
         return Translatable::make($this);
     }
 
     /**
-     * @param  bool  $hideLabel
+     * @param bool $hideLabel
      * @return static
      */
     public function hideLabel(bool $hideLabel): self
@@ -300,7 +354,7 @@ public function isHiddenLabel(): bool
     /**
      * string $page.
      *
-     * @param  string  $page
+     * @param string $page
      * @return bool
      */
     public function isVisibleOnPage(string $page): bool
@@ -309,7 +363,7 @@ public function isVisibleOnPage(string $page): bool
     }
 
     /**
-     * @param  array|string  $pages
+     * @param array|string $pages
      * @return static
      */
     public function hideOnPages($pages): self
@@ -318,7 +372,23 @@ public function hideOnPages($pages): self
     }
 
     /**
-     * @param  array|string  $pages
+     * @param mixed $pages
+     * @param bool $visibility
+     * @return $this
+     */
+    protected function setPagesVisibility($pages, bool $visibility): self
+    {
+        $pages = array_intersect($pages, array_keys($this->visibility));
+
+        foreach ($pages as $page) {
+            $this->visibility[$page] = $visibility;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param array|string $pages
      * @return static
      */
     public function showOnPages($pages): self
@@ -329,10 +399,10 @@ public function showOnPages($pages): self
     /**
      * Make column sortable.
      *
-     * @param  null|\Closure  $callback
+     * @param null|Closure $callback
      * @return static
      */
-    public function sortable(\Closure $callback = null): self
+    public function sortable(Closure $callback = null): self
     {
         app('scaffold.module')->addSortable(
             $this->id(),
@@ -383,24 +453,24 @@ public function value()
         }
 
         $property = last(explode('.', $this->id));
+
         $val = $this->model->getAttribute($property);
 
         if ($val instanceof \BenSampo\Enum\Enum) {
             $val = $val->value;
         }
 
-        return $val;
+        return $val ?? request($this->id);
     }
 
     /**
-     * @param $key
-     * @param  null  $value
-     * @param  mixed  $attribute
+     * @param mixed $attribute
+     * @param null $value
      * @return static
      */
     public function setAttribute($attribute, $value = null): self
     {
-        if (\is_array($attribute)) {
+        if (is_array($attribute)) {
             foreach ($attribute as $key => $value) {
                 $this->setAttribute($key, $value);
             }
@@ -412,79 +482,13 @@ public function setAttribute($attribute, $value = null): self
     }
 
     /**
-     * @return array
-     */
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @return string
-     */
-    public function translationKey()
-    {
-        $key = sprintf('administrator::columns.%s.%s', $this->translatableModule()->url(), $this->id);
-
-        if (!trans()->has($key)) {
-            $key = sprintf('administrator::columns.%s.%s', 'global', $this->id);
-        }
-
-        return $key;
-    }
-
-    /**
-     * @return string
-     */
-    public function descriptionKey()
-    {
-        $key = sprintf('administrator::hints.%s.%s', $this->translatableModule()->url(), $this->id);
-
-        if (!trans()->has($key)) {
-            $key = sprintf('administrator::hints.%s.%s', 'global', $this->id);
-        }
-
-        return $key;
-    }
-
-    /**
-     * @param  \Closure  $condition
+     * @param Closure $condition
      * @return self
      */
-    public function when(\Closure $condition): self
+    public function when(Closure $condition): self
     {
         $this->when = $condition;
 
         return $this;
     }
-
-    /**
-     * @param  mixed  $pages
-     * @param  bool  $visibility
-     * @return $this
-     */
-    protected function setPagesVisibility($pages, bool $visibility): self
-    {
-        $pages = array_intersect($pages, array_keys($this->visibility));
-
-        foreach ($pages as $page) {
-            $this->visibility[$page] = $visibility;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param  string  $page
-     * @param  string  $field
-     * @return string
-     */
-    protected function template(string $page, string $field = null): string
-    {
-        return sprintf(
-            'administrator::fields.%s.%s',
-            Str::snake($field ?? class_basename($this)),
-            $page
-        );
-    }
 }
diff --git a/src/Field/File.php b/src/Field/File.php
index 2ca1d5f..98d2865 100644
--- a/src/Field/File.php
+++ b/src/Field/File.php
@@ -6,31 +6,22 @@
 
 class File extends Field
 {
-    protected $visibility = [
+    public $visibility = [
         Scaffolding::PAGE_INDEX => true,
         Scaffolding::PAGE_EDIT => true,
         Scaffolding::PAGE_VIEW => true,
     ];
 
-    /**
-     * @return array
-     */
     public function onEdit(): array
     {
         return $this->onIndex();
     }
 
-    /**
-     * @return array
-     */
     public function onView(): array
     {
         return $this->onIndex();
     }
 
-    /**
-     * @return array
-     */
     protected function onIndex(): array
     {
         return [
diff --git a/src/Field/HasMany.php b/src/Field/HasMany.php
index 02a53e6..a312f81 100644
--- a/src/Field/HasMany.php
+++ b/src/Field/HasMany.php
@@ -2,9 +2,12 @@
 
 namespace Terranet\Administrator\Field;
 
+use Closure;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Terranet\Administrator\Architect;
+use Terranet\Administrator\Exception;
 use Terranet\Administrator\Field\Traits\HandlesRelation;
 use Terranet\Administrator\Modules\Faked;
 
@@ -13,17 +16,17 @@ class HasMany extends Field
     use HandlesRelation;
 
     /** @var string */
-    protected $icon = 'list-ul';
+    public $icon = 'list-ul';
 
-    /** @var null|\Closure */
+    /** @var null|Closure */
     protected $query;
 
     /**
-     * @param \Closure $query
+     * @param Closure $query
      *
      * @return $this
      */
-    public function withQuery(\Closure $query)
+    public function withQuery(Closure $query)
     {
         $this->query = $query;
 
@@ -43,17 +46,14 @@ public function setIcon(string $icon): self
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param Builder $query
      * @param Model $model
      * @param string $direction
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
-    public function sortBy(
-        \Illuminate\Database\Eloquent\Builder $query,
-        Model $model,
-        string $direction
-    ): \Illuminate\Database\Eloquent\Builder {
+    public function sortBy(Builder $query, Model $model, string $direction): Builder
+    {
         return $query->withCount($this->id())->orderBy("{$this->id()}_count", $direction);
     }
 
@@ -66,7 +66,7 @@ protected function onIndex(): array
         $related = $relation->getRelated();
 
         // apply a query
-        if ($this->query instanceof \Closure) {
+        if ($this->query instanceof Closure) {
             $relation = \call_user_func_array($this->query, [$relation]);
         }
 
@@ -82,7 +82,6 @@ protected function onIndex(): array
         }
 
         return [
-            'icon' => $this->icon,
             'module' => $module,
             'count' => $relation->count(),
             'url' => $url ?? null,
@@ -91,7 +90,7 @@ protected function onIndex(): array
 
     /**
      * @return array
-     * @throws \Terranet\Administrator\Exception
+     * @throws Exception
      *
      */
     protected function onView(): array
@@ -100,7 +99,7 @@ protected function onView(): array
         $related = $relation->getRelated();
 
         // apply a query
-        if ($this->query instanceof \Closure) {
+        if ($this->query instanceof Closure) {
             $relation = \call_user_func_array($this->query, [$relation]);
         }
 
diff --git a/src/Field/HasOne.php b/src/Field/HasOne.php
index 08f2b7d..fb7a925 100644
--- a/src/Field/HasOne.php
+++ b/src/Field/HasOne.php
@@ -2,6 +2,7 @@
 
 namespace Terranet\Administrator\Field;
 
+use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Terranet\Administrator\Collection\Mutable;
 use Terranet\Administrator\Traits\Module\HasColumns;
@@ -16,7 +17,7 @@ class HasOne extends BelongsTo
     /** @var null|array */
     protected $except;
 
-    /** @var null|\Closure */
+    /** @var null|Closure */
     protected $withColumnsCallback;
 
     /**
@@ -103,7 +104,7 @@ protected function onView(): array
 
     /**
      * @param $related
-     * @return \Terranet\Administrator\Collection\Mutable
+     * @return Mutable
      */
     protected function relatedColumns($related): Mutable
     {
@@ -113,10 +114,10 @@ protected function relatedColumns($related): Mutable
     }
 
     /**
-     * @param  \Closure  $callback
+     * @param  Closure  $callback
      * @return $this
      */
-    public function withColumns(\Closure $callback): self
+    public function withColumns(Closure $callback): self
     {
         $this->withColumnsCallback = $callback;
 
diff --git a/src/Field/Media.php b/src/Field/Media.php
index 636587a..4d60709 100644
--- a/src/Field/Media.php
+++ b/src/Field/Media.php
@@ -8,13 +8,13 @@
 class Media extends Field
 {
     /** @var string */
-    protected $collection = 'default';
+    public $collection = 'default';
 
     /** @var string */
-    protected $conversion = '';
+    public $conversion = '';
 
     /** @var int */
-    protected $perPage = 10;
+    public $perPage = 10;
 
     /**
      * @param string $collection
@@ -39,9 +39,6 @@ public function convertedTo(string $conversion): self
         return $this;
     }
 
-    /**
-     * @return array
-     */
     protected function onIndex(): array
     {
         return [
@@ -49,23 +46,4 @@ protected function onIndex(): array
             'module' => Architect::resourceByEntity($this->model) ?: app('scaffold.module'),
         ];
     }
-
-    /**
-     * @return array
-     */
-    protected function onView(): array
-    {
-        return [
-            'collection' => $this->collection,
-            'conversion' => $this->conversion,
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function onEdit(): array
-    {
-        return [];
-    }
 }
diff --git a/src/Field/Number.php b/src/Field/Number.php
index 39d4506..fa358bc 100644
--- a/src/Field/Number.php
+++ b/src/Field/Number.php
@@ -4,58 +4,8 @@
 
 class Number extends Field
 {
-    /** @var min|float */
-    protected $min = 0;
-
-    /** @var null|float */
-    protected $max = null;
-
-    /** @var null|double */
-    protected $step = 1;
-
-    /**
-     * @param  float  $min
-     * @return $this
-     */
-    public function min(float $min): self
-    {
-        $this->min = $min;
-
-        return $this;
-    }
-
-    /**
-     * @param  null|float  $max
-     * @return $this
-     */
-    public function max(?float $max): self
-    {
-        $this->max = $max;
-
-        return $this;
-    }
-
-    /**
-     * @param  float  $step
-     * @return $this
-     */
-    public function step(float $step): self
-    {
-        $this->step = $step;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
     public function getAttributes(): array
     {
-        return parent::getAttributes() + [
-                'min' => $this->min,
-                'max' => $this->max,
-                'step' => $this->step,
-                'style' => 'width: 150px',
-            ];
+        return ['style' => 'width: 150px'] + parent::getAttributes();
     }
 }
diff --git a/src/Field/Phone.php b/src/Field/Phone.php
index 9c6b9ea..45d5a9f 100644
--- a/src/Field/Phone.php
+++ b/src/Field/Phone.php
@@ -7,10 +7,8 @@ class Phone extends Field
     /**
      * @return array
      */
-    public function getAattributes(): array
+    public function getAttributes(): array
     {
-        return parent::getAttributes() + [
-                'style' => 'width: 250px',
-            ];
+        return ['style' => 'width: 250px'] + parent::getAttributes();
     }
 }
diff --git a/src/Field/Radio.php b/src/Field/Radio.php
index 7f35151..be8a5a5 100644
--- a/src/Field/Radio.php
+++ b/src/Field/Radio.php
@@ -4,14 +4,9 @@
 
 class Radio extends Field
 {
-    /**
-     * @var array
-     */
-    protected $options = [];
+    /** @var array */
+    public $options = [];
 
-    /**
-     * @return array
-     */
     public function getOptions(): array
     {
         return (array) $this->options;
@@ -28,30 +23,4 @@ public function setOptions(array $options): self
 
         return $this;
     }
-
-    /**
-     * @return array
-     */
-    public function onIndex()
-    {
-        return [
-            'options' => $this->getOptions(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function onView()
-    {
-        return $this->onIndex();
-    }
-
-    /**
-     * @return array
-     */
-    public function onEdit()
-    {
-        return $this->onIndex();
-    }
 }
diff --git a/src/Field/Section.php b/src/Field/Section.php
index 4617b10..2189c51 100644
--- a/src/Field/Section.php
+++ b/src/Field/Section.php
@@ -7,7 +7,7 @@
 class Section extends Id
 {
     /** @var array */
-    protected $visibility = [
+    public $visibility = [
         Scaffolding::PAGE_INDEX => false,
         Scaffolding::PAGE_EDIT => true,
         Scaffolding::PAGE_VIEW => true,
diff --git a/src/Field/Textarea.php b/src/Field/Textarea.php
index 6e777fd..4b82391 100644
--- a/src/Field/Textarea.php
+++ b/src/Field/Textarea.php
@@ -19,13 +19,13 @@ class Textarea extends Field
     ];
 
     /** @var array */
-    protected $visibility = [
+    public $visibility = [
         Scaffolding::PAGE_INDEX => false,
         Scaffolding::PAGE_EDIT => true,
         Scaffolding::PAGE_VIEW => true,
     ];
 
-    protected $editor = false;
+    public $editor = false;
 
     /**
      * @param $editor
diff --git a/src/Field/Traits/HasEmptyValue.php b/src/Field/Traits/HasEmptyValue.php
new file mode 100644
index 0000000..6039118
--- /dev/null
+++ b/src/Field/Traits/HasEmptyValue.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Terranet\Administrator\Field\Traits;
+
+trait HasEmptyValue
+{
+    protected $allowEmpty = false;
+
+    /**
+     * @param bool $flag
+     * @return self
+     */
+    public function allowEmpty(bool $flag = false): self
+    {
+        $this->allowEmpty = (bool) $flag;
+
+        return $this;
+    }
+}
diff --git a/src/Field/Traits/SupportsMultipleValues.php b/src/Field/Traits/SupportsMultipleValues.php
new file mode 100644
index 0000000..40f44ac
--- /dev/null
+++ b/src/Field/Traits/SupportsMultipleValues.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Terranet\Administrator\Field\Traits;
+
+trait SupportsMultipleValues
+{
+    public $isArray = false;
+
+    public function isArray(): self
+    {
+        $this->isArray = true;
+
+        return $this;
+    }
+}
diff --git a/src/Field/Translatable.php b/src/Field/Translatable.php
index 5c32c52..1e4e133 100644
--- a/src/Field/Translatable.php
+++ b/src/Field/Translatable.php
@@ -2,10 +2,13 @@
 
 namespace Terranet\Administrator\Field;
 
+use Closure;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Str;
 use Terranet\Administrator\Scaffolding;
 use Terranet\Localizer\Locale;
+use function localizer\locale;
+use function localizer\locales;
 
 /**
  * Class Translatable.
@@ -16,13 +19,13 @@
  * @method markdown()
  * @method medium()
  * @method hideLabel()
- * @method sortable(\Closure $callback = null)
+ * @method sortable(Closure $callback = null)
  * @method disableSorting()
  */
 class Translatable
 {
     /** @var Field */
-    protected $field;
+    public $field;
 
     /**
      * Translatable constructor.
@@ -44,12 +47,12 @@ protected function __construct(Field $field)
      */
     public function __call($method, $args)
     {
-        if (\in_array($method, Textarea::KNOWN_EDITORS, true)) {
+        if (in_array($method, Textarea::KNOWN_EDITORS, true)) {
             return new static($this->field->$method());
         }
 
         if (method_exists($this->field, $method)) {
-            return \call_user_func_array([$this->field, $method], $args);
+            return call_user_func_array([$this->field, $method], $args);
         }
     }
 
@@ -58,7 +61,7 @@ public function __call($method, $args)
      *
      * @return Translatable
      */
-    public static function make(Field $field)
+    public static function make(Field $field): self
     {
         return new static($field);
     }
@@ -70,7 +73,7 @@ public static function make(Field $field)
      */
     public function render(string $page = 'index')
     {
-        if (\in_array($page, [Scaffolding::PAGE_INDEX, Scaffolding::PAGE_VIEW], true)) {
+        if (in_array($page, [Scaffolding::PAGE_INDEX, Scaffolding::PAGE_VIEW], true)) {
             if ($this->field->hasCustomFormat()) {
                 return $this->field->callFormatter($this->field->getModel(), $page);
             }
@@ -86,7 +89,7 @@ public function render(string $page = 'index')
         ];
 
         if (method_exists($this, $dataGetter = 'on'.Str::title($page))) {
-            $data += \call_user_func([$this, $dataGetter]);
+            $data += call_user_func([$this, $dataGetter]);
         }
 
         return View::make('administrator::fields.translatable.'.$page, $data);
@@ -97,7 +100,7 @@ public function render(string $page = 'index')
      *
      * @return string
      */
-    public function name(Locale $language)
+    public function name(Locale $language): string
     {
         return "translatable[{$language->id()}][{$this->field->id()}]";
     }
@@ -121,8 +124,8 @@ public function value(Locale $language)
     protected function onEdit(): array
     {
         return [
-            'languages' => \localizer\locales(),
-            'locale' => \localizer\locale(),
+            'languages' => locales(),
+            'locale' => locale(),
             'container' => $this,
             'translations' => app('scaffold.translations'),
         ];
diff --git a/src/Filter/DateRange.php b/src/Filter/DateRange.php
index c310814..0e4e0e1 100644
--- a/src/Filter/DateRange.php
+++ b/src/Filter/DateRange.php
@@ -19,11 +19,11 @@ class DateRange extends Filter implements Searchable
      */
     public function searchBy(Builder $query, Model $model): Builder
     {
-        [$date_from, $date_to] = array_values($this->value());
+        [$dateFrom, $dateTo] = array_values($this->value());
 
-        if ($date_from && $date_to) {
-            $query->whereDate("{$model->getTable()}.{$this->id()}", '>=', $date_from);
-            $query->whereDate("{$model->getTable()}.{$this->id()}", '<=', $date_to);
+        if ($dateFrom && $dateTo) {
+            $query->whereDate("{$model->getTable()}.{$this->id()}", '>=', $dateFrom);
+            $query->whereDate("{$model->getTable()}.{$this->id()}", '<=', $dateTo);
         }
 
         return $query;
diff --git a/src/Filter/Enum.php b/src/Filter/Enum.php
index 294e122..aa7e53f 100644
--- a/src/Filter/Enum.php
+++ b/src/Filter/Enum.php
@@ -6,35 +6,30 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Terranet\Administrator\Contracts\Filter\Searchable;
+use Terranet\Administrator\Traits\Form\SupportsListTypes;
 
 class Enum extends Filter implements Searchable
 {
-    /** @var string  */
-    protected $component = 'enum';
+    use SupportsListTypes;
 
     /** @var array */
-    protected $options = [];
+    public $options = [];
+    /** @var string */
+    protected $component = 'enum';
 
     /**
-     * @param  mixed array|\Closure $options
-     * @return self
-     * @throws Exception
+     * @param Builder $query
+     * @param Model $model
+     *
+     * @return Builder
      */
-    public function setOptions($options): self
+    public function searchBy(Builder $query, Model $model): Builder
     {
-        if (!(\is_array($options) || $options instanceof \Closure)) {
-            throw new Exception('Enum accepts only `array` or `Closure` as options.');
-        }
-
-        if ($options instanceof \Closure) {
-            $options = \call_user_func_array($options, []);
-
-            return $this->setOptions($options);
+        if (!\is_array($value = $this->value())) {
+            $value = [$value];
         }
 
-        $this->options = $options;
-
-        return $this;
+        return $query->whereIn("{$model->getTable()}.{$this->id()}", $value);
     }
 
     /**
@@ -46,27 +41,24 @@ public function getOptions()
     }
 
     /**
-     * @param Builder $query
-     * @param Model $model
-     *
-     * @return Builder
+     * @param mixed array|\Closure $options
+     * @return self
+     * @throws Exception
      */
-    public function searchBy(Builder $query, Model $model): Builder
+    public function setOptions($options): self
     {
-        if (!\is_array($value = $this->value())) {
-            $value = [$value];
+        if (!(\is_array($options) || $options instanceof \Closure)) {
+            throw new Exception('Enum accepts only `array` or `Closure` as options.');
         }
 
-        return $query->whereIn("{$model->getTable()}.{$this->id()}", $value);
-    }
+        if ($options instanceof \Closure) {
+            $options = \call_user_func_array($options, []);
 
-    /**
-     * @return array
-     */
-    protected function renderWith()
-    {
-        return [
-            'options' => $this->getOptions(),
-        ];
+            return $this->setOptions($options);
+        }
+
+        $this->options = $options;
+
+        return $this;
     }
 }
diff --git a/src/Filter/Filter.php b/src/Filter/Filter.php
index 0372e7d..4b7b7ec 100644
--- a/src/Filter/Filter.php
+++ b/src/Filter/Filter.php
@@ -5,23 +5,26 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Str;
+use phpDocumentor\Reflection\Types\This;
 use Terranet\Administrator\Architect;
 use Terranet\Administrator\Contracts\Form\Queryable;
+use Terranet\Administrator\Field\Traits\SupportsMultipleValues;
 use Terranet\Administrator\Traits\Form\ExecutesQuery;
+use Terranet\Administrator\Traits\Form\HasHtmlAttributes;
 use Terranet\Translatable\Translatable;
 
 abstract class Filter implements Queryable
 {
-    use ExecutesQuery;
+    use ExecutesQuery, HasHtmlAttributes, SupportsMultipleValues;
 
     /** @var string */
-    protected $id;
+    public $id;
 
     /** @var string */
-    protected $title;
+    public $title;
 
     /** @var mixed */
-    protected $value;
+    public $value;
 
     /**
      * Generic constructor.
@@ -54,46 +57,33 @@ public static function make($title, $id = null, \Closure $callback = null): self
     }
 
     /**
-     * Return Element ID.
+     * Return Element title.
      *
      * @return string
      */
-    public function id(): string
+    public function title(): string
     {
-        return $this->id;
+        return $this->title;
     }
 
     /**
-     * Form name.
+     * @param string $title
      *
-     * @return string
+     * @return self
      */
-    public function name()
+    public function setTitle(string $title): self
     {
-        $parts = explode('.', $this->id());
+        $this->title = $title;
 
-        if (\count($parts) > 1) {
-            $first = Arr::first($parts);
-            $other = \array_slice($parts, 1);
-
-            $other = array_map(function ($part) {
-                return "[$part]";
-            }, $other);
-
-            return implode('', array_merge([$first], $other));
-        }
-
-        return $this->id();
+        return $this;
     }
 
     /**
-     * Return Element title.
-     *
-     * @return string
+     * @return mixed
      */
-    public function title(): string
+    public function value()
     {
-        return $this->title;
+        return $this->value;
     }
 
     /**
@@ -110,14 +100,6 @@ public function setValue($value): self
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    public function value()
-    {
-        return $this->value;
-    }
-
     /**
      * @return mixed
      */
@@ -125,17 +107,10 @@ public function render()
     {
         return View::make($this->template(), [
                 'field' => $this,
+                'attributes' => $this->attributes,
             ] + $this->renderWith());
     }
 
-    /**
-     * @return array
-     */
-    protected function renderWith()
-    {
-        return [];
-    }
-
     /**
      * @param string $page
      * @param string $field
@@ -150,6 +125,11 @@ protected function template(): string
         );
     }
 
+    protected function renderWith(): array
+    {
+        return [];
+    }
+
     /**
      * @param $model
      *
@@ -160,4 +140,37 @@ protected function shouldSearchInTranslations($model): bool
         return $model instanceof Translatable
             && \in_array($this->name(), $model->getTranslatedAttributes(), true);
     }
+
+    /**
+     * Form name.
+     *
+     * @return string
+     */
+    public function name()
+    {
+        $parts = explode('.', $this->id());
+
+        if (\count($parts) > 1) {
+            $first = Arr::first($parts);
+            $other = \array_slice($parts, 1);
+
+            $other = array_map(function ($part) {
+                return "[$part]";
+            }, $other);
+
+            return implode('', array_merge([$first], $other));
+        }
+
+        return $this->id().($this->isArray ?? false ? '[]' : '');
+    }
+
+    /**
+     * Return Element ID.
+     *
+     * @return string
+     */
+    public function id(): string
+    {
+        return $this->id;
+    }
 }
diff --git a/src/Filter/Number.php b/src/Filter/Number.php
index d900f6c..e23ed2f 100644
--- a/src/Filter/Number.php
+++ b/src/Filter/Number.php
@@ -19,6 +19,6 @@ class Number extends Filter implements Searchable
      */
     public function searchBy(Builder $query, Model $model): Builder
     {
-        return $query->where("{$table->getTable()}.{$this->id()}", '=', (int) $this->value());
+        return $query->where("{$model->getTable()}.{$this->id()}", '=', (int) $this->value());
     }
 }
diff --git a/src/Filter/Text.php b/src/Filter/Text.php
index 3663997..1a91d34 100644
--- a/src/Filter/Text.php
+++ b/src/Filter/Text.php
@@ -10,15 +10,15 @@
 
 class Text extends Filter implements Searchable
 {
-    /** @var string */
-    protected $component = 'text';
-
     /**
      * Whether to enable search modes or not.
      *
      * @var bool
      */
-    protected $withModes = false;
+    public $withModes = false;
+
+    /** @var string */
+    protected $component = 'text';
 
     /**
      * @return $this
@@ -65,13 +65,10 @@ public function searchBy(Builder $query, Model $model): Builder
         return $query->where("{$model->getTable()}.{$this->id()}", $operator, $value);
     }
 
-    /**
-     * @return array
-     */
     protected function renderWith(): array
     {
-        return [
-            'modes' => $this->withModes ? trans('administrator::buttons.search_modes') : [],
-        ];
+        $mods = $this->withModes ? trans('administrator::buttons.search_modes') : [];
+
+        return compact('mods');
     }
 }
diff --git a/src/Middleware/Resources.php b/src/Middleware/Resources.php
index 430fb1d..8e375ef 100755
--- a/src/Middleware/Resources.php
+++ b/src/Middleware/Resources.php
@@ -40,13 +40,13 @@ public function __construct(Application $application)
      */
     public function handle(Request $request, Closure $next)
     {
-        $this->collectModules(function ($fileInfo) {
-            $this->resolveClass($fileInfo, function ($module) {
+        $this->collectModules(function ($fileInfo) use ($request) {
+            $this->resolveClass($fileInfo, function ($module) use ($request) {
                 if ($module instanceof Module) {
                     $this->registerModule($module);
                 }
 
-                if ($this->navigableResource($module)
+                if ($this->navigableResource($module, $request)
                     && ($navigation = $this->application->make('scaffold.navigation'))
                 ) {
                     $this->makeNavigation($module, $navigation);
@@ -57,18 +57,6 @@ public function handle(Request $request, Closure $next)
         return $next($request);
     }
 
-    /**
-     * Make sure the resource is Navigable && Should be visible.
-     *
-     * @param $module
-     *
-     * @return bool
-     */
-    protected function navigableResource($module)
-    {
-        return $module instanceof Navigable && $module->showIf();
-    }
-
     protected function collectModules(Closure $callback)
     {
         $resources = Collection::make($this->application['files']->allFiles(
@@ -99,6 +87,19 @@ protected function registerModule(Module $module)
         return $this;
     }
 
+    /**
+     * Make sure the resource is Navigable && Should be visible.
+     *
+     * @param $module
+     * @param Request $request
+     *
+     * @return bool
+     */
+    protected function navigableResource($module, Request $request)
+    {
+        return $module instanceof Navigable && $module->showIf($request);
+    }
+
     /**
      * @param Module $module
      * @param $navigation
@@ -114,7 +115,6 @@ protected function makeNavigation(Module $module, $navigation)
 
         if ($group = $module->group()) {
             $navigation = $this->findOrCreateGroup($module, $navigation, $group);
-
             $order = $module->order() ?: \count($navigation->getChilds()) + 1;
         }
 
diff --git a/src/Providers/ContainersServiceProvider.php b/src/Providers/ContainersServiceProvider.php
index 34eaba1..ef98372 100755
--- a/src/Providers/ContainersServiceProvider.php
+++ b/src/Providers/ContainersServiceProvider.php
@@ -10,7 +10,6 @@
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Terranet\Administrator\Architect;
-use Terranet\Administrator\Contracts\Services\Finder;
 use Terranet\Administrator\Schema;
 use Terranet\Localizer\Locale;
 
@@ -76,7 +75,7 @@ public function __construct()
                 /**
                  * Set ReadOnly locales.
                  *
-                 * @param  array  $readonly
+                 * @param array $readonly
                  * @return self
                  */
                 public function setReadonly(array $readonly = []): self
@@ -123,12 +122,9 @@ protected function registerAdminResource()
     protected function registerAdminModel()
     {
         $this->app->singleton('scaffold.model', function (Application $app) {
-            /** @var int $id */
             $id = (int) $app['router']->current()->parameter('id');
 
-            /** @var Finder $finder */
-            $finder = app('scaffold.module')->finder();
-            if ($id && $finder) {
+            if ($id && ($finder = app('scaffold.module')->finder())) {
                 return $finder->find($id);
             }
         });
diff --git a/src/Services/Saver.php b/src/Services/Saver.php
index b047505..d087bee 100755
--- a/src/Services/Saver.php
+++ b/src/Services/Saver.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
+use Terranet\Administrator\Collection\Group;
 use Terranet\Administrator\Contracts\Services\Saver as SaverContract;
 use Terranet\Administrator\Field\BelongsTo;
 use Terranet\Administrator\Field\BelongsToMany;
@@ -15,8 +16,8 @@
 use Terranet\Administrator\Field\Id;
 use Terranet\Administrator\Field\Image;
 use Terranet\Administrator\Field\Media;
-use Terranet\Administrator\Field\Translatable;
 use Terranet\Administrator\Field\Traits\HandlesRelation;
+use Terranet\Administrator\Field\Translatable;
 use Terranet\Administrator\Requests\UpdateRequest;
 use function admin\db\scheme;
 
@@ -54,7 +55,7 @@ class Saver implements SaverContract
      * Saver constructor.
      *
      * @param               $eloquent
-     * @param  UpdateRequest  $request
+     * @param UpdateRequest $request
      */
     public function __construct($eloquent, UpdateRequest $request)
     {
@@ -70,26 +71,7 @@ public function __construct($eloquent, UpdateRequest $request)
     public function sync()
     {
         $this->connection()->transaction(function () {
-            foreach ($this->editable() as $field) {
-                // get original HTML input
-                $name = $field->id();
-
-                if ($this->isKey($field) || $this->isMediaFile($field) || $this->isTranslatable($field)) {
-                    continue;
-                }
-
-                if ($this->isRelation($field)) {
-                    $this->relations[$name] = $field;
-                }
-
-                $value = $this->isFile($field) ? $this->request->file($name) : $this->request->get($name);
-
-                $value = $this->isBoolean($field) ? (bool) $value : $value;
-
-                $value = $this->handleJsonType($name, $value);
-
-                $this->data[$name] = $value;
-            }
+            $this->collectData($this->editable());
 
             $this->cleanData();
 
@@ -108,144 +90,69 @@ public function sync()
     }
 
     /**
-     * Fetch editable fields.
+     * Get database connection.
      *
-     * @return mixed
+     * @return \Illuminate\Foundation\Application|mixed
      */
-    protected function editable()
+    protected function connection()
     {
-        return app('scaffold.module')->form();
+        return app('db');
     }
 
-    /**
-     * @param $field
-     * @return bool
-     */
-    protected function isKey($field)
+    protected function collectData($fields): void
     {
-        return $field instanceof Id;
-    }
+        foreach ($fields as $field) {
+            if ($field instanceof Group) {
+                $this->collectData($field->elements());
+                continue;
+            }
 
-    /**
-     * @param $field
-     * @return bool
-     */
-    protected function isFile($field)
-    {
-        return $field instanceof File || $field instanceof Image;
-    }
+            // get original HTML input
+            $name = $field->id();
 
-    /**
-     * Protect request data against external data.
-     */
-    protected function cleanData()
-    {
-        $this->data = Arr::except($this->data, [
-            '_token',
-            'save',
-            'save_create',
-            'save_return',
-            $this->repository->getKeyName(),
-        ]);
+            if ($this->isKey($field) || $this->isMediaFile($field) || $this->isTranslatable($field)) {
+                continue;
+            }
 
-        // clean from relationable fields.
-        $this->data = array_diff_key($this->data, $this->relations);
-    }
+            if ($this->isRelation($field)) {
+                $this->relations[$name] = $field;
+            }
 
-    /**
-     * Persist main eloquent model including relations & media.
-     */
-    protected function process()
-    {
-        $this->nullifyEmptyNullables($this->repository->getTable());
+            $value = $this->isFile($field) ? $this->request->file($name) : $this->request->get($name);
 
-        \DB::transaction(function () {
-            $this->repository->fill(
-                $this->excludeUnfillable(
-                    $this->protectAgainstNullPassword()
-                )
-            )->save();
+            $value = $this->isBoolean($field) ? (bool) $value : $value;
 
-            $this->saveRelations();
+            $value = $this->handleJsonType($name, $value);
 
-            $this->saveMedia();
-        });
+            $this->data[$name] = $value;
+        }
     }
 
     /**
-     * Save relations.
+     * @param $field
+     * @return bool
      */
-    protected function saveRelations()
+    protected function isKey($field)
     {
-        foreach ($this->relations as $name => $field) {
-            $relation = \call_user_func([$this->repository, $name]);
-
-            switch (\get_class($field)) {
-                case BelongsTo::class:
-                    /** @var \Illuminate\Database\Eloquent\Relations\BelongsTo $relation */
-                    $relation->associate(
-                        $this->request->get($this->getForeignKey($relation))
-                    )->save();
-
-                    break;
-                case HasOne::class:
-                    /** @var \Illuminate\Database\Eloquent\Relations\HasOne $relation */
-                    $related = $relation->getResults();
-
-                    $related && $related->exists
-                        ? $related->update($this->request->get($name))
-                        : $this->repository->{$name}()->create($this->request->get($name));
-
-                    break;
-                case BelongsToMany::class:
-                    $values = array_map('intval', $this->request->get($name, []));
-                    $relation->sync($values);
-
-                    break;
-                default:
-                    break;
-            }
-        }
+        return $field instanceof Id;
     }
 
     /**
-     * Process Media.
+     * @param $field
+     * @return bool
      */
-    protected function saveMedia()
+    protected function isMediaFile($field)
     {
-        if ($this->repository instanceof HasMedia) {
-            $media = (array) $this->request['_media_'];
-
-            if (!empty($trash = Arr::get($media, '_trash_', []))) {
-                $this->repository->media()->whereIn(
-                    'id',
-                    $trash
-                )->delete();
-            }
-
-            foreach (Arr::except($media, '_trash_') as $collection => $objects) {
-                foreach ($objects as $uploadedFile) {
-                    $this->repository->addMedia($uploadedFile)->toMediaCollection($collection);
-                }
-            }
-        }
+        return $field instanceof Media;
     }
 
     /**
-     * Remove null values from data.
-     *
-     * @param $relation
-     * @param $values
-     * @return array
+     * @param $field
+     * @return bool
      */
-    protected function forgetNullValues($relation, $values)
+    protected function isTranslatable($field)
     {
-        $keys = explode('.', $this->getQualifiedRelatedKeyName($relation));
-        $key = array_pop($keys);
-
-        return array_filter((array) $values[$key], function ($value) {
-            return null !== $value;
-        });
+        return $field instanceof Translatable;
     }
 
     /**
@@ -262,17 +169,21 @@ protected function isRelation($field)
     }
 
     /**
-     * @param $this
+     * @param $field
+     * @return bool
      */
-    protected function appendTranslationsToRelations()
+    protected function isFile($field)
     {
-        if (!empty($this->relations)) {
-            foreach (array_keys((array) $this->relations) as $relation) {
-                if ($translations = $this->input("{$relation}.translatable")) {
-                    $this->relations[$relation] += $translations;
-                }
-            }
-        }
+        return $field instanceof File || $field instanceof Image;
+    }
+
+    /**
+     * @param $field
+     * @return bool
+     */
+    protected function isBoolean($field)
+    {
+        return $field instanceof Boolean;
     }
 
     /**
@@ -291,6 +202,33 @@ protected function handleJsonType($name, $value)
         return $value;
     }
 
+    /**
+     * Fetch editable fields.
+     *
+     * @return mixed
+     */
+    protected function editable()
+    {
+        return app('scaffold.module')->form();
+    }
+
+    /**
+     * Protect request data against external data.
+     */
+    protected function cleanData()
+    {
+        $this->data = Arr::except($this->data, [
+            '_token',
+            'save',
+            'save_create',
+            'save_return',
+            $this->repository->getKeyName(),
+        ]);
+
+        // clean from relationable fields.
+        $this->data = array_diff_key($this->data, $this->relations);
+    }
+
     /**
      * Collect translations.
      */
@@ -302,20 +240,24 @@ protected function collectTranslatable()
     }
 
     /**
-     * Get database connection.
-     *
-     * @return \Illuminate\Foundation\Application|mixed
+     * @param $this
      */
-    protected function connection()
+    protected function appendTranslationsToRelations()
     {
-        return app('db');
+        if (!empty($this->relations)) {
+            foreach (array_keys((array) $this->relations) as $relation) {
+                if ($translations = $this->input("{$relation}.translatable")) {
+                    $this->relations[$relation] += $translations;
+                }
+            }
+        }
     }
 
     /**
      * Retrieve request input value.
      *
      * @param $key
-     * @param  null  $default
+     * @param null $default
      * @return mixed
      */
     protected function input($key, $default = null)
@@ -323,6 +265,26 @@ protected function input($key, $default = null)
         return app('request')->input($key, $default);
     }
 
+    /**
+     * Persist main eloquent model including relations & media.
+     */
+    protected function process()
+    {
+        $this->nullifyEmptyNullables($this->repository->getTable());
+
+        \DB::transaction(function () {
+            $this->repository->fill(
+                $this->excludeUnfillable(
+                    $this->protectAgainstNullPassword()
+                )
+            )->save();
+
+            $this->saveRelations();
+
+            $this->saveMedia();
+        });
+    }
+
     /**
      * Set empty "nullable" values to null.
      *
@@ -346,7 +308,7 @@ protected function nullifyEmptyNullables($table)
     /**
      * Exclude unfillable columns.
      *
-     * @param  array  $data
+     * @param array $data
      * @return array
      */
     protected function excludeUnfillable(array $data): array
@@ -384,29 +346,78 @@ protected function protectAgainstNullPassword(): array
     }
 
     /**
-     * @param $field
-     * @return bool
+     * Save relations.
      */
-    protected function isBoolean($field)
+    protected function saveRelations()
     {
-        return $field instanceof Boolean;
+        foreach ($this->relations as $name => $field) {
+            $relation = \call_user_func([$this->repository, $name]);
+
+            switch (\get_class($field)) {
+                case BelongsTo::class:
+                    /** @var \Illuminate\Database\Eloquent\Relations\BelongsTo $relation */
+                    $relation->associate(
+                        $this->request->get($this->getForeignKey($relation))
+                    )->save();
+
+                    break;
+                case HasOne::class:
+                    /** @var \Illuminate\Database\Eloquent\Relations\HasOne $relation */
+                    $related = $relation->getResults();
+
+                    $related && $related->exists
+                        ? $related->update($this->request->get($name))
+                        : $this->repository->{$name}()->create($this->request->get($name));
+
+                    break;
+                case BelongsToMany::class:
+                    $values = array_map('intval', $this->request->get($name, []));
+                    $relation->sync($values);
+
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 
     /**
-     * @param $field
-     * @return bool
+     * Process Media.
      */
-    protected function isMediaFile($field)
+    protected function saveMedia()
     {
-        return $field instanceof Media;
+        if ($this->repository instanceof HasMedia) {
+            $media = (array) $this->request['_media_'];
+
+            if (!empty($trash = Arr::get($media, '_trash_', []))) {
+                $this->repository->media()->whereIn(
+                    'id',
+                    $trash
+                )->delete();
+            }
+
+            foreach (Arr::except($media, '_trash_') as $collection => $objects) {
+                foreach ($objects as $uploadedFile) {
+                    $this->repository->addMedia($uploadedFile)->toMediaCollection($collection);
+                }
+            }
+        }
     }
 
     /**
-     * @param $field
-     * @return bool
+     * Remove null values from data.
+     *
+     * @param $relation
+     * @param $values
+     * @return array
      */
-    protected function isTranslatable($field)
+    protected function forgetNullValues($relation, $values)
     {
-        return $field instanceof Translatable;
+        $keys = explode('.', $this->getQualifiedRelatedKeyName($relation));
+        $key = array_pop($keys);
+
+        return array_filter((array) $values[$key], function ($value) {
+            return null !== $value;
+        });
     }
 }
diff --git a/src/Traits/Actions/Skeleton.php b/src/Traits/Actions/Skeleton.php
index 78c086d..f34c441 100755
--- a/src/Traits/Actions/Skeleton.php
+++ b/src/Traits/Actions/Skeleton.php
@@ -7,18 +7,10 @@
 
 trait Skeleton
 {
-    /**
-     * @return string
-     */
-    protected function type(): string
-    {
-        return 'primary';
-    }
-
     /**
      * Render action button.
      *
-     * @param  Eloquent  $entity
+     * @param Eloquent $entity
      * @return string
      */
     public function render(Eloquent $entity = null)
@@ -28,44 +20,43 @@ public function render(Eloquent $entity = null)
 
         return
             <<<OUTPUT
-<a data-scaffold-action="{$action}" data-scaffold-key="{$this->entityKey($entity)}" href="{$this->route($entity)}" {$this->attributes($entity)}>
+<a data-scaffold-action="{$action}" data-form-target="{$this->formTarget()}" data-scaffold-key="{$this->entityKey($entity)}" href="{$this->route($entity)}" {$this->attributes($entity)}>
     {$icon}<span>{$this->name($entity)}</span>
 </a>
 OUTPUT;
     }
 
     /**
-     * Render action button.
-     *
-     * @param  Eloquent  $entity
+     * @param Eloquent $entity
      * @return string
      */
-    public function renderBtn(Eloquent $entity = null)
+    public function action(Eloquent $entity = null)
     {
-        $action = app('scaffold.module')->url().'-'.$this->action($entity);
-        $icon = ($i = $this->icon($entity)) ? "<i class=\"fa {$i}\"></i>" : '';
+        return Str::snake(class_basename($this));
+    }
 
-        return
-            <<<OUTPUT
-<a class="btn btn-{$this->type()}" data-scaffold-action="{$action}" data-scaffold-key="{$this->entityKey($entity)}" href="{$this->route($entity)}" {$this->attributes($entity)}>
-    {$icon}<span>{$this->name($entity)}</span>
-</a>
-OUTPUT;
+    /**
+     * @param Eloquent $entity
+     * @return string
+     */
+    public function icon(Eloquent $entity = null): string
+    {
+        return 'fa-circle-thin';
     }
 
     /**
-     * @param  Eloquent  $entity
+     * @param null $entity
      * @return string
      */
-    public function action(Eloquent $entity = null)
+    protected function entityKey($entity = null): string
     {
-        return Str::snake(class_basename($this));
+        return $entity ? $entity->getKey() : 'empty';
     }
 
     /**
      * Action name.
      *
-     * @param  Eloquent  $entity
+     * @param Eloquent $entity
      * @return string
      */
     public function name(Eloquent $entity = null)
@@ -75,15 +66,6 @@ public function name(Eloquent $entity = null)
             : Str::title(str_replace('_', ' ', Str::snake(class_basename($this))));
     }
 
-    /**
-     * @param  Eloquent  $entity
-     * @return string
-     */
-    public function icon(Eloquent $entity = null): string
-    {
-        return 'fa-circle-thin';
-    }
-
     /**
      * @return string
      */
@@ -99,11 +81,34 @@ protected function translationKey(): string
     }
 
     /**
-     * @param  null  $entity
+     * Render action button.
+     *
+     * @param Eloquent $entity
      * @return string
      */
-    protected function entityKey($entity = null): string
+    public function renderBtn(Eloquent $entity = null)
     {
-        return $entity ? $entity->getKey() : 'empty';
+        $action = app('scaffold.module')->url().'-'.$this->action($entity);
+        $icon = ($i = $this->icon($entity)) ? "<i class=\"fa {$i}\"></i>" : '';
+
+        return
+            <<<OUTPUT
+<a class="btn btn-{$this->type()}" data-scaffold-action="{$action}" data-scaffold-key="{$this->entityKey($entity)}" href="{$this->route($entity)}" {$this->attributes($entity)}>
+    {$icon}<span>{$this->name($entity)}</span>
+</a>
+OUTPUT;
+    }
+
+    /**
+     * @return string
+     */
+    protected function type(): string
+    {
+        return 'primary';
+    }
+
+    protected function formTarget(): string
+    {
+        return '_self';
     }
 }
diff --git a/src/Traits/Form/HasHtmlAttributes.php b/src/Traits/Form/HasHtmlAttributes.php
new file mode 100644
index 0000000..3c85608
--- /dev/null
+++ b/src/Traits/Form/HasHtmlAttributes.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Terranet\Administrator\Traits\Form;
+
+trait HasHtmlAttributes
+{
+    public $attributes = ['class' => 'form-control'];
+
+    /**
+     * @param array $attributes
+     * @return static
+     */
+    public function setAttributes(array $attributes)
+    {
+        $this->attributes = array_replace($this->attributes, $attributes);
+
+        return $this;
+    }
+
+    /**
+     * @param float $min
+     * @return static
+     */
+    public function min(float $min)
+    {
+        $this->attributes['min'] = $min;
+
+        return $this;
+    }
+
+    /**
+     * @param null|float $max
+     * @return static
+     */
+    public function max(float $max)
+    {
+        $this->attributes['max'] = $max;
+
+        return $this;
+    }
+
+    /**
+     * @param float $step
+     * @return static
+     */
+    public function step(float $step)
+    {
+        $this->attributes['step'] = $step;
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Form/SupportsListTypes.php b/src/Traits/Form/SupportsListTypes.php
new file mode 100644
index 0000000..e48f5a3
--- /dev/null
+++ b/src/Traits/Form/SupportsListTypes.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Terranet\Administrator\Traits\Form;
+
+trait SupportsListTypes
+{
+    /** @var string */
+    public $type = 'select';
+
+    /**
+     * @return $this
+     */
+    public function datalist(): self
+    {
+        $this->type = 'datalist';
+
+        return $this;
+    }
+}
diff --git a/src/Traits/Module/AllowsNavigation.php b/src/Traits/Module/AllowsNavigation.php
index ea5f612..4dd19cb 100755
--- a/src/Traits/Module/AllowsNavigation.php
+++ b/src/Traits/Module/AllowsNavigation.php
@@ -2,6 +2,8 @@
 
 namespace Terranet\Administrator\Traits\Module;
 
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Str;
 use Terranet\Administrator\Architect;
 use Terranet\Administrator\Contracts\Module\Navigable;
@@ -69,7 +71,7 @@ public function navigableParams(): array
      *
      * @return mixed
      */
-    public function showIf()
+    public function showIf(Request $request)
     {
         return ($guard = $this->guard()) && method_exists($guard, 'showIf')
             ? $guard->showIf()
@@ -79,7 +81,7 @@ public function showIf()
     /**
      * Appends count of items to a navigation.
      *
-     * @return bool
+     * @return int
      */
     public function appendCount()
     {
diff --git a/src/helpers.php b/src/helpers.php
index 5f5199b..1e8010c 100755
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -472,4 +472,11 @@ function badge(string $label = '', string $class = 'bg-green')
     {
         return '<span class="badge '.$class.'">'.$label.'</span>';
     }
+
+    function label_case($key, $upper = false)
+    {
+        $key = str_replace('_', ' ', preg_replace('~_id$~si', '', $key));
+
+        return $upper ? mb_strtoupper($key) : Str::title($key);
+    }
 }
diff --git a/tests/Actions/CollectionTest.php b/tests/Actions/CollectionTest.php
index 33cd1ac..b192226 100644
--- a/tests/Actions/CollectionTest.php
+++ b/tests/Actions/CollectionTest.php
@@ -2,7 +2,7 @@
 
 namespace Terranet\Administrator\Tests\Actions;
 
-use App\User;
+use App\Models\User;
 use Terranet\Administrator\Actions\Collection;
 use Terranet\Administrator\Actions\RemoveSelected;
 use Terranet\Administrator\Actions\SaveOrder;
diff --git a/tests/Actions/RemoveSelectedTest.php b/tests/Actions/RemoveSelectedTest.php
index 3f30b57..3a2709b 100644
--- a/tests/Actions/RemoveSelectedTest.php
+++ b/tests/Actions/RemoveSelectedTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Actions;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder;
@@ -22,7 +22,7 @@ public function it_authorizes_delete_action()
         $actions->expects($this->once())->method('authorize')->with('delete', $user = new User());
 
         $module = $this->createMock(Module::class);
-        $module->method('actionsManager')->willReturn($actions);
+        $module->method('actions')->willReturn($actions);
 
         $action = $this->createMock(RemoveSelected::class);
         $this->invokeMethod($action, 'canDelete', [$user]);
diff --git a/tests/Actions/SaveOrderTest.php b/tests/Actions/SaveOrderTest.php
index 1c53dbb..1ec1e2a 100644
--- a/tests/Actions/SaveOrderTest.php
+++ b/tests/Actions/SaveOrderTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Actions;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Terranet\Administrator\Actions\SaveOrder;
 use Terranet\Administrator\Tests\CoreTestCase;
diff --git a/tests/Auth/SuperAdminRuleTest.php b/tests/Auth/SuperAdminRuleTest.php
index 32ddde7..c1e274b 100644
--- a/tests/Auth/SuperAdminRuleTest.php
+++ b/tests/Auth/SuperAdminRuleTest.php
@@ -2,7 +2,7 @@
 
 namespace Terranet\Administrator\Tests\Auth;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\SessionGuard;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Factory;
diff --git a/tests/Collection/GroupTest.php b/tests/Collection/GroupTest.php
index a8443fd..a841d89 100755
--- a/tests/Collection/GroupTest.php
+++ b/tests/Collection/GroupTest.php
@@ -2,16 +2,16 @@
 
 namespace Terranet\Administrator\Tests\Collection;
 
+use PHPUnit\Framework\TestCase;
 use Terranet\Administrator\Collection\Group;
-use Terranet\Administrator\Field\Field;
 use Terranet\Administrator\Tests\CreatesElement;
 use Terranet\Administrator\Tests\MocksObjects;
 
-class GroupTest extends \PHPUnit\Framework\TestCase
+class GroupTest extends TestCase
 {
     use CreatesElement, MocksObjects;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 
@@ -32,7 +32,7 @@ public function it_returns_id_and_title()
     public function it_excludes_stop_words_from_the_title()
     {
         $group = new Group('group_id');
-        $this->assertSame('Group', $group->title());
+        $this->assertSame('Group Id', $group->title());
     }
 
     /** @test */
diff --git a/tests/Collection/MutableTest.php b/tests/Collection/MutableTest.php
index 1aad1b3..0cc34c7 100755
--- a/tests/Collection/MutableTest.php
+++ b/tests/Collection/MutableTest.php
@@ -270,8 +270,7 @@ public function it_finds_an_element_by_id()
 
         $this->assertSame($e, $this->collection->get(1));
 
-        $this->expectException(\Exception::class);
-        $this->collection->find('not-exist');
+        $this->assertNull($this->collection->find('not-exist'));
     }
 
     /** @test */
diff --git a/tests/Controllers/AdminControllerTest.php b/tests/Controllers/AdminControllerTest.php
index 9c85496..7518fb3 100644
--- a/tests/Controllers/AdminControllerTest.php
+++ b/tests/Controllers/AdminControllerTest.php
@@ -55,7 +55,7 @@ public function it_authorizes_the_action_call()
                 ->willReturn(true);
 
         $module = $this->createMock(Module::class);
-        $module->method('actionsManager')->willReturn($actions);
+        $module->method('actions')->willReturn($actions);
 
         $controller->authorize($ability, null);
     }
@@ -83,7 +83,7 @@ public function it_throw_unauthorized_exception()
                 ->willReturn(false);
 
         $module = $this->createMock(Module::class);
-        $module->method('actionsManager')->willReturn($actions);
+        $module->method('actions')->willReturn($actions);
 
         $this->expectException(HttpException::class);
         $controller->authorize($ability, null);