diff --git a/composer.json b/composer.json
index 7ddedaa..0a60a13 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "source": "https://github.com/wintercms/wn-sso-plugin"
     },
     "require": {
+        "winter/wn-backend-module": "~1.2.8|dev-develop",
         "laravel/socialite": "~5.3"
     }
 }
diff --git a/controllers/Logs.php b/controllers/Logs.php
index c9d47c6..45b2952 100644
--- a/controllers/Logs.php
+++ b/controllers/Logs.php
@@ -4,6 +4,7 @@
 
 use BackendMenu;
 use Backend\Classes\Controller;
+use System\Classes\SettingsManager;
 
 /**
  * Logs Backend Controller
@@ -18,12 +19,15 @@ class Logs extends Controller
         \Backend\Behaviors\ListController::class,
     ];
 
+    public $hiddenActions = ['create', 'update'];
+
     public $requiredPermissions = ['winter.sso.view_logs'];
 
     public function __construct()
     {
         parent::__construct();
 
-        BackendMenu::setContext('Winter.SSO', 'sso', 'logs');
+        BackendMenu::setContext('Winter.System', 'system', 'settings');
+        SettingsManager::setContext('Winter.SSO', 'logs');
     }
 }
diff --git a/controllers/logs/_list_toolbar.php b/controllers/logs/_list_toolbar.php
index 6248521..6723522 100644
--- a/controllers/logs/_list_toolbar.php
+++ b/controllers/logs/_list_toolbar.php
@@ -1,10 +1,4 @@
 <div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/sso/logs/create') ?>"
-        class="btn btn-primary wn-icon-plus">
-        <?= e(trans('backend::lang.form.create_title', ['name' => trans('winter.sso::lang.models.log.label')])); ?>
-    </a>
-
     <button
         class="btn btn-danger wn-icon-trash-o"
         disabled="disabled"
diff --git a/controllers/logs/config_list.yaml b/controllers/logs/config_list.yaml
index fa311fa..f17deed 100644
--- a/controllers/logs/config_list.yaml
+++ b/controllers/logs/config_list.yaml
@@ -12,7 +12,7 @@ modelClass: Winter\SSO\Models\Log
 title: 'winter.sso::lang.models.log.label_plural'
 
 # Link URL for each record
-recordUrl: winter/sso/logs/update/:id
+recordUrl: winter/sso/logs/preview/:id
 
 # Message to display if the list is empty
 noRecordsMessage: backend::lang.list.no_records
diff --git a/controllers/logs/create.php b/controllers/logs/create.php
deleted file mode 100644
index 30658cb..0000000
--- a/controllers/logs/create.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/sso/logs') ?>"><?= e(trans('winter.sso::lang.models.log.label_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans('winter.sso::lang.models.log.label')])); ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans('winter.sso::lang.models.log.label')])); ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')); ?>
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/sso/logs') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('winter/sso/logs') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
-<?php endif ?>
diff --git a/controllers/logs/index.php b/controllers/logs/index.php
deleted file mode 100644
index ea43a36..0000000
--- a/controllers/logs/index.php
+++ /dev/null
@@ -1 +0,0 @@
-<?= $this->listRender() ?>
diff --git a/controllers/logs/preview.php b/controllers/logs/preview.php
deleted file mode 100644
index 7546b33..0000000
--- a/controllers/logs/preview.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/sso/logs') ?>"><?= e(trans('winter.sso::lang.models.log.label_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('winter/sso/logs') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
-<?php endif ?>
diff --git a/controllers/logs/update.php b/controllers/logs/update.php
deleted file mode 100644
index aa13c28..0000000
--- a/controllers/logs/update.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/sso/logs') ?>">Logs</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans('winter.sso::lang.models.log.label')])); ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.save')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans('winter.sso::lang.models.log.label')])); ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.save_and_close')); ?>
-                </button>
-                <button
-                    type="button"
-                    class="wn-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans('winter.sso::lang.models.log.label')])); ?>"
-                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/sso/logs') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('winter/sso/logs') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
-<?php endif ?>
diff --git a/models/log/columns.yaml b/models/log/columns.yaml
index 98a7cb8..14b47d5 100644
--- a/models/log/columns.yaml
+++ b/models/log/columns.yaml
@@ -18,11 +18,6 @@ columns:
         type: text
         searchable: true
         sortable: true
-    user_email:
-        label: winter.sso::lang.models.log.user
-        type: partial
-        path: $/winter/sso/models/log/column.user.php
-        clickable: true
     ip:
         label: winter.sso::lang.models.log.ip
         type: text
@@ -39,4 +34,10 @@ columns:
         type: text
         sortable: true
         searchable: true
+        invisible: false
+    user_email:
+        label: winter.sso::lang.models.log.user
+        type: partial
+        path: $/winter/sso/models/log/column.user.php
+        clickable: true
         invisible: true
diff --git a/models/log/fields.yaml b/models/log/fields.yaml
index 0494e8f..14577dc 100644
--- a/models/log/fields.yaml
+++ b/models/log/fields.yaml
@@ -5,4 +5,33 @@
 fields:
     id:
         label: 'winter.sso::lang.models.general.id'
-        disabled: true
+        span: left
+
+    created_at:
+        label: 'winter.sso::lang.models.general.created_at'
+        type: datepicker
+        span: auto
+
+    provider:
+        label: winter.sso::lang.models.log.provider
+        span: left
+
+    action:
+        label: winter.sso::lang.models.log.action
+        span: auto
+
+    ip:
+        label: winter.sso::lang.models.log.ip
+        span: left
+
+    provided_id:
+        label: winter.sso::lang.models.log.provided_id
+        span: auto
+
+    provided_email:
+        label: winter.sso::lang.models.log.provided_email
+        span: left
+
+    user_email:
+        label: winter.sso::lang.models.log.user
+        span: auto