diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig
index 0e8c9722c..8ba54e038 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig
@@ -6,14 +6,13 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">{{ trans('visiosoft.module.advs::field.filter') }}
-                </h5>
+                <h5 class="modal-title">{{ trans('visiosoft.module.advs::field.filter') }}</h5>
                 <button type="button" class="close" data-dismiss="modal">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <div class="col-12 border p-2 mb-2 mx-0">
+                <div class="col-12 border p-2 mb-2 mx-0 category-filter-modal">
                     <label class="w-100">
                         <b>{{ trans('visiosoft.module.advs::button.categories') }}</b>
                     </label>
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionsController.php
new file mode 100644
index 000000000..b6e7a0343
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionsController.php
@@ -0,0 +1,43 @@
+<?php namespace Visiosoft\AdvsModule\Http\Controller\Admin;
+
+use Visiosoft\AdvsModule\Option\Form\OptionFormBuilder;
+use Visiosoft\AdvsModule\Option\Table\OptionTableBuilder;
+use Anomaly\Streams\Platform\Http\Controller\AdminController;
+
+class OptionsController extends AdminController
+{
+
+    /**
+     * Display an index of existing entries.
+     *
+     * @param OptionTableBuilder $table
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function index(OptionTableBuilder $table)
+    {
+        return $table->render();
+    }
+
+    /**
+     * Create a new entry.
+     *
+     * @param OptionFormBuilder $form
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function create(OptionFormBuilder $form)
+    {
+        return $form->render();
+    }
+
+    /**
+     * Edit an existing entry.
+     *
+     * @param OptionFormBuilder $form
+     * @param        $id
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function edit(OptionFormBuilder $form, $id)
+    {
+        return $form->render($id);
+    }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/Contract/OptionInterface.php b/addons/default/visiosoft/advs-module/src/Option/Contract/OptionInterface.php
new file mode 100644
index 000000000..0a4ae493f
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/Contract/OptionInterface.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option\Contract;
+
+use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
+
+interface OptionInterface extends EntryInterface
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/Contract/OptionRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Option/Contract/OptionRepositoryInterface.php
new file mode 100644
index 000000000..5cc23cdf5
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/Contract/OptionRepositoryInterface.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option\Contract;
+
+use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface;
+
+interface OptionRepositoryInterface extends EntryRepositoryInterface
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/Form/OptionFormBuilder.php b/addons/default/visiosoft/advs-module/src/Option/Form/OptionFormBuilder.php
new file mode 100644
index 000000000..e72e1b700
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/Form/OptionFormBuilder.php
@@ -0,0 +1,66 @@
+<?php namespace Visiosoft\AdvsModule\Option\Form;
+
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+
+class OptionFormBuilder extends FormBuilder
+{
+
+    /**
+     * The form fields.
+     *
+     * @var array|string
+     */
+    protected $fields = [];
+
+    /**
+     * Additional validation rules.
+     *
+     * @var array|string
+     */
+    protected $rules = [];
+
+    /**
+     * Fields to skip.
+     *
+     * @var array|string
+     */
+    protected $skips = [];
+
+    /**
+     * The form actions.
+     *
+     * @var array|string
+     */
+    protected $actions = [];
+
+    /**
+     * The form buttons.
+     *
+     * @var array|string
+     */
+    protected $buttons = [
+        'cancel',
+    ];
+
+    /**
+     * The form options.
+     *
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * The form sections.
+     *
+     * @var array
+     */
+    protected $sections = [];
+
+    /**
+     * The form assets.
+     *
+     * @var array
+     */
+    protected $assets = [];
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionCollection.php b/addons/default/visiosoft/advs-module/src/Option/OptionCollection.php
new file mode 100644
index 000000000..a49026241
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionCollection.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Anomaly\Streams\Platform\Entry\EntryCollection;
+
+class OptionCollection extends EntryCollection
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionCriteria.php b/addons/default/visiosoft/advs-module/src/Option/OptionCriteria.php
new file mode 100644
index 000000000..62a8d14c1
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionCriteria.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Anomaly\Streams\Platform\Entry\EntryCriteria;
+
+class OptionCriteria extends EntryCriteria
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionModel.php b/addons/default/visiosoft/advs-module/src/Option/OptionModel.php
new file mode 100644
index 000000000..d7c3866ba
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionModel.php
@@ -0,0 +1,9 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Visiosoft\AdvsModule\Option\Contract\OptionInterface;
+use Anomaly\Streams\Platform\Model\Advs\AdvsOptionsEntryModel;
+
+class OptionModel extends AdvsOptionsEntryModel implements OptionInterface
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionObserver.php b/addons/default/visiosoft/advs-module/src/Option/OptionObserver.php
new file mode 100644
index 000000000..de3fcac5b
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionObserver.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Anomaly\Streams\Platform\Entry\EntryObserver;
+
+class OptionObserver extends EntryObserver
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionPresenter.php b/addons/default/visiosoft/advs-module/src/Option/OptionPresenter.php
new file mode 100644
index 000000000..ea0e94b84
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionPresenter.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Anomaly\Streams\Platform\Entry\EntryPresenter;
+
+class OptionPresenter extends EntryPresenter
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionRepository.php b/addons/default/visiosoft/advs-module/src/Option/OptionRepository.php
new file mode 100644
index 000000000..398e229b5
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionRepository.php
@@ -0,0 +1,25 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
+use Anomaly\Streams\Platform\Entry\EntryRepository;
+
+class OptionRepository extends EntryRepository implements OptionRepositoryInterface
+{
+
+    /**
+     * The entry model.
+     *
+     * @var OptionModel
+     */
+    protected $model;
+
+    /**
+     * Create a new OptionRepository instance.
+     *
+     * @param OptionModel $model
+     */
+    public function __construct(OptionModel $model)
+    {
+        $this->model = $model;
+    }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionRouter.php b/addons/default/visiosoft/advs-module/src/Option/OptionRouter.php
new file mode 100644
index 000000000..1c4060b64
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionRouter.php
@@ -0,0 +1,8 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Anomaly\Streams\Platform\Entry\EntryRouter;
+
+class OptionRouter extends EntryRouter
+{
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/OptionSeeder.php b/addons/default/visiosoft/advs-module/src/Option/OptionSeeder.php
new file mode 100644
index 000000000..5df169c44
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/OptionSeeder.php
@@ -0,0 +1,15 @@
+<?php namespace Visiosoft\AdvsModule\Option;
+
+use Anomaly\Streams\Platform\Database\Seeder\Seeder;
+
+class OptionSeeder extends Seeder
+{
+
+    /**
+     * Run the seeder.
+     */
+    public function run()
+    {
+        //
+    }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Option/Table/OptionTableBuilder.php b/addons/default/visiosoft/advs-module/src/Option/Table/OptionTableBuilder.php
new file mode 100644
index 000000000..3769d746f
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Option/Table/OptionTableBuilder.php
@@ -0,0 +1,61 @@
+<?php namespace Visiosoft\AdvsModule\Option\Table;
+
+use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
+
+class OptionTableBuilder extends TableBuilder
+{
+
+    /**
+     * The table views.
+     *
+     * @var array|string
+     */
+    protected $views = [];
+
+    /**
+     * The table filters.
+     *
+     * @var array|string
+     */
+    protected $filters = [];
+
+    /**
+     * The table columns.
+     *
+     * @var array|string
+     */
+    protected $columns = [];
+
+    /**
+     * The table buttons.
+     *
+     * @var array|string
+     */
+    protected $buttons = [
+        'edit'
+    ];
+
+    /**
+     * The table actions.
+     *
+     * @var array|string
+     */
+    protected $actions = [
+        'delete'
+    ];
+
+    /**
+     * The table options.
+     *
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * The table assets.
+     *
+     * @var array
+     */
+    protected $assets = [];
+
+}