diff --git a/controllers/Cities.php b/controllers/Cities.php
index 0dcaca7..5fc6e85 100644
--- a/controllers/Cities.php
+++ b/controllers/Cities.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -15,13 +14,6 @@ class Cities extends Controller
         \Backend\Behaviors\ListController::class,
     ];
 
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'cities');
-    }
-
     public function onGetInspectorConfiguration()
     {
         return [
diff --git a/controllers/Countries.php b/controllers/Countries.php
index bbdc2ce..a0da8e1 100644
--- a/controllers/Countries.php
+++ b/controllers/Countries.php
@@ -3,7 +3,6 @@
 use Backend;
 use Request;
 use Response;
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -23,8 +22,6 @@ public function __construct()
     {
         parent::__construct();
 
-        BackendMenu::setContext('Winter.Test', 'test', 'countries');
-
         $this->addJs('/modules/system/assets/js/framework.extras.js');
         $this->addJs('/modules/system/assets/css/framework.extras.css');
     }
diff --git a/controllers/Galleries.php b/controllers/Galleries.php
index 1de7e01..0611fe7 100644
--- a/controllers/Galleries.php
+++ b/controllers/Galleries.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -15,11 +14,4 @@ class Galleries extends Controller
     ];
 
     public $requiredPermissions = ['winter.test.access_plugin'];
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'galleries');
-    }
 }
diff --git a/controllers/Locations.php b/controllers/Locations.php
index 59620ce..b2da6b7 100644
--- a/controllers/Locations.php
+++ b/controllers/Locations.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -12,11 +11,4 @@ class Locations extends Controller
         \Backend\Behaviors\FormController::class,
         \Backend\Behaviors\ListController::class,
     ];
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'locations');
-    }
 }
diff --git a/controllers/Pages.php b/controllers/Pages.php
index 20f9dda..83eed74 100644
--- a/controllers/Pages.php
+++ b/controllers/Pages.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -13,33 +12,7 @@ class Pages extends Controller
         \Backend\Behaviors\ListController::class,
     ];
 
-    public $requiredPermissions = ['winter.test.access_plugin'];
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'pages');
-    }
-
-    public function index()
-    {
-        $this->asExtension('ListController')->index();
-
-        $this->bodyClass = 'compact-container';
-    }
+    public $formLayout = 'fancy';
 
-    public function create()
-    {
-        $this->bodyClass = 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy';
-
-        $this->asExtension('FormController')->create();
-    }
-
-    public function update($recordId)
-    {
-        $this->bodyClass = 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy';
-
-        $this->asExtension('FormController')->update($recordId);
-    }
+    public $requiredPermissions = ['winter.test.access_plugin'];
 }
diff --git a/controllers/People.php b/controllers/People.php
index 2d003cd..588b420 100644
--- a/controllers/People.php
+++ b/controllers/People.php
@@ -2,7 +2,6 @@
 
 use Mail;
 use Flash;
-use BackendMenu;
 use Winter\Test\Models\Phone;
 use Backend\Classes\FormField;
 use Backend\Classes\Controller;
@@ -21,13 +20,6 @@ class People extends Controller
 
     public $requiredPermissions = ['winter.test.access_plugin'];
 
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'people');
-    }
-
     public function onSendTestEmail()
     {
         $data = ['msg' => 'Hello world'];
diff --git a/controllers/Posts.php b/controllers/Posts.php
index 30691d3..4e3692b 100644
--- a/controllers/Posts.php
+++ b/controllers/Posts.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 use Winter\Test\Models\Post;
 
@@ -48,8 +47,6 @@ public function __construct()
         }
 
         parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'posts');
     }
 
     public function index()
diff --git a/controllers/Records.php b/controllers/Records.php
index 6ec5501..ff575b6 100644
--- a/controllers/Records.php
+++ b/controllers/Records.php
@@ -1,7 +1,9 @@
-<?php namespace Winter\Test\Controllers;
+<?php
+
+namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
+use Winter\Storm\Support\Facades\Flash;
 
 /**
  * Records Backend Controller
@@ -16,12 +18,20 @@ class Records extends Controller
         \Backend\Behaviors\ListController::class,
     ];
 
-    public $bodyClass = 'compact-container';
+    /**
+     * @var string The form layout to use. One of standard, sidebar, fancy
+     */
+    public $formLayout = 'fancy';
 
-    public function __construct()
+    public function onBasicButton()
     {
-        parent::__construct();
+        sleep(1);
+        Flash::success("AJAX request succeeded!");
+    }
 
-        BackendMenu::setContext('Winter.Test', 'test', 'records');
+    public function onRenderBasicPopup()
+    {
+        sleep(1);
+        return $this->makePartial('basic_popup');
     }
 }
diff --git a/controllers/Reviews.php b/controllers/Reviews.php
index 3e0056c..5ecff09 100644
--- a/controllers/Reviews.php
+++ b/controllers/Reviews.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -14,11 +13,4 @@ class Reviews extends Controller
     ];
 
     public $requiredPermissions = ['winter.test.access_plugin'];
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'reviews');
-    }
 }
diff --git a/controllers/Trees.php b/controllers/Trees.php
index 63a38a4..e385fa8 100644
--- a/controllers/Trees.php
+++ b/controllers/Trees.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -19,11 +18,4 @@ class Trees extends Controller
     ];
 
     public $requiredPermissions = ['winter.test.access_plugin'];
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'trees');
-    }
 }
diff --git a/controllers/Users.php b/controllers/Users.php
index 3cc8454..e49fd01 100644
--- a/controllers/Users.php
+++ b/controllers/Users.php
@@ -1,6 +1,5 @@
 <?php namespace Winter\Test\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
 
 /**
@@ -16,13 +15,6 @@ class Users extends Controller
 
     public $requiredPermissions = ['winter.test.access_plugin'];
 
-    public function __construct()
-    {
-        parent::__construct();
-
-        BackendMenu::setContext('Winter.Test', 'test', 'users');
-    }
-
     public function listFilterExtendScopes($filter)
     {
         // Demonstrate how to disable a scope based on the value of another scope
diff --git a/controllers/categories/_reorder_toolbar.htm b/controllers/categories/_reorder_toolbar.htm
deleted file mode 100644
index 7f5f40d..0000000
--- a/controllers/categories/_reorder_toolbar.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<div data-control="toolbar">
-    <a href="<?= Backend::url('winter/test/trees') ?>" class="btn btn-default oc-icon-chevron-left">
-        Return to Trees
-    </a>
-</div>
diff --git a/controllers/categories/create.htm b/controllers/categories/create.htm
deleted file mode 100644
index b38bd08..0000000
--- a/controllers/categories/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Categories</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Category..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Category..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/trees') ?>">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/test/trees') ?>" class="btn btn-default">Return to categories list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/categories/preview.htm b/controllers/categories/preview.htm
deleted file mode 100644
index 1060b57..0000000
--- a/controllers/categories/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Categories</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/test/trees') ?>" class="btn btn-default">Return to categories list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/categories/reorder.htm b/controllers/categories/reorder.htm
deleted file mode 100644
index 78c7061..0000000
--- a/controllers/categories/reorder.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Trees</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?= $this->reorderRender() ?>
diff --git a/controllers/categories/update.htm b/controllers/categories/update.htm
deleted file mode 100644
index c3b0a26..0000000
--- a/controllers/categories/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Categories</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Category..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Category..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Category..."
-                    data-request-confirm="Do you really want to delete this category?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/trees') ?>">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/test/trees') ?>" class="btn btn-default">Return to categories list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/channels/_reorder_toolbar.htm b/controllers/channels/_reorder_toolbar.htm
deleted file mode 100644
index 7f5f40d..0000000
--- a/controllers/channels/_reorder_toolbar.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<div data-control="toolbar">
-    <a href="<?= Backend::url('winter/test/trees') ?>" class="btn btn-default oc-icon-chevron-left">
-        Return to Trees
-    </a>
-</div>
diff --git a/controllers/channels/create.htm b/controllers/channels/create.htm
deleted file mode 100644
index 22397f4..0000000
--- a/controllers/channels/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Channels</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Channel..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Channel..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/trees') ?>">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/test/trees') ?>" class="btn btn-default">Return to channels list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/channels/preview.htm b/controllers/channels/preview.htm
deleted file mode 100644
index 85cbe79..0000000
--- a/controllers/channels/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Channels</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/test/trees') ?>" class="btn btn-default">Return to channels list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/channels/reorder.htm b/controllers/channels/reorder.htm
deleted file mode 100644
index 78c7061..0000000
--- a/controllers/channels/reorder.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Trees</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?= $this->reorderRender() ?>
diff --git a/controllers/channels/update.htm b/controllers/channels/update.htm
deleted file mode 100644
index d29347c..0000000
--- a/controllers/channels/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Channels</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Channel..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Channel..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Channel..."
-                    data-request-confirm="Do you really want to delete this channel?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/trees') ?>">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/test/trees') ?>" class="btn btn-default">Return to channels list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/models/city/_inspector_field.htm b/controllers/cities/_field_inspector.php
similarity index 100%
rename from models/city/_inspector_field.htm
rename to controllers/cities/_field_inspector.php
diff --git a/controllers/cities/_list_toolbar.htm b/controllers/cities/_list_toolbar.htm
deleted file mode 100644
index 7bfe0b0..0000000
--- a/controllers/cities/_list_toolbar.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/cities/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        New City
-    </a>
-
-    <button
-        class="btn btn-danger oc-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
-        data-request="onDelete"
-        data-request-confirm="Are you sure you want to delete the selected Cities?"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', 'disabled')"
-        data-stripe-load-indicator>
-        Delete selected
-    </button>
-</div>
diff --git a/controllers/cities/config_list.yaml b/controllers/cities/config_list.yaml
index d779102..c67c057 100644
--- a/controllers/cities/config_list.yaml
+++ b/controllers/cities/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/city/columns.yaml
 modelClass: Winter\Test\Models\City
 
 # List Title
-title: Manage Cities
+title: winter.test::lang.models.city.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/cities/update/:id
diff --git a/controllers/cities/create.htm b/controllers/cities/create.htm
deleted file mode 100644
index 9dbd19b..0000000
--- a/controllers/cities/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/cities') ?>">Cities</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating City..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating City..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/cities') ?>">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/test/cities') ?>" class="btn btn-default">Return to cities list</a></p>
-
-<?php endif ?>
diff --git a/controllers/cities/preview.htm b/controllers/cities/preview.htm
deleted file mode 100644
index ed6fa53..0000000
--- a/controllers/cities/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/cities') ?>">Cities</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/test/cities') ?>" class="btn btn-default">Return to cities list</a></p>
-
-<?php endif ?>
diff --git a/controllers/cities/update.htm b/controllers/cities/update.htm
deleted file mode 100644
index 6a2e9ef..0000000
--- a/controllers/cities/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/cities') ?>">Cities</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving City..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving City..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting City..."
-                    data-request-confirm="Delete this city?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/cities') ?>">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/test/cities') ?>" class="btn btn-default">Return to cities list</a></p>
-
-<?php endif ?>
diff --git a/controllers/countries/_google_button.htm b/controllers/countries/_google_button.php
similarity index 100%
rename from controllers/countries/_google_button.htm
rename to controllers/countries/_google_button.php
diff --git a/controllers/countries/_list_toolbar.htm b/controllers/countries/_list_toolbar.php
similarity index 99%
rename from controllers/countries/_list_toolbar.htm
rename to controllers/countries/_list_toolbar.php
index ffbc30f..798da8b 100644
--- a/controllers/countries/_list_toolbar.htm
+++ b/controllers/countries/_list_toolbar.php
@@ -14,4 +14,4 @@
             }
         });
     </script>
-</div>
\ No newline at end of file
+</div>
diff --git a/controllers/countries/config_form.yaml b/controllers/countries/config_form.yaml
index 543993c..636ee1d 100644
--- a/controllers/countries/config_form.yaml
+++ b/controllers/countries/config_form.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 # Record name
-name: Country
+name: winter.test::lang.models.country.label
 
 # Model Form Field configuration
 form: ~/plugins/winter/test/models/country/fields.yaml
@@ -16,16 +16,16 @@ defaultRedirect: winter/test/countries
 
 # Create page
 create:
-    title: Create Countries
+    title: Create Country
     redirect: winter/test/countries/update/:id
     redirectClose: winter/test/countries
 
 # Update page
 update:
-    title: Edit Countries
+    title: Edit Country
     redirect: winter/test/countries
     redirectClose: winter/test/countries
 
 # Preview page
 preview:
-    title: Preview Countries
\ No newline at end of file
+    title: Preview Country
diff --git a/controllers/countries/config_list.yaml b/controllers/countries/config_list.yaml
index 0f348e1..8770e58 100644
--- a/controllers/countries/config_list.yaml
+++ b/controllers/countries/config_list.yaml
@@ -9,7 +9,7 @@ list: ~/plugins/winter/test/models/country/columns.yaml
 modelClass: Winter\Test\Models\Country
 
 # List Title
-title: Manage Countries
+title: winter.test::lang.models.country.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/countries/update/:id
diff --git a/controllers/countries/create.htm b/controllers/countries/create.htm
deleted file mode 100644
index 6fe436c..0000000
--- a/controllers/countries/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/countries') ?>">Countries</a></li>
-        <li><?= e(trans($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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Country..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Country..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/countries') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/countries') ?>" class="btn btn-default">Return to countries list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/countries/index.htm b/controllers/countries/index.php
similarity index 100%
rename from controllers/countries/index.htm
rename to controllers/countries/index.php
diff --git a/controllers/countries/preview.htm b/controllers/countries/preview.htm
deleted file mode 100644
index 88e322f..0000000
--- a/controllers/countries/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/countries') ?>">Countries</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="layout-item stretch layout-column form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/countries') ?>" class="btn btn-default">Return to countries list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/countries/update.htm b/controllers/countries/update.htm
deleted file mode 100644
index 35d548b..0000000
--- a/controllers/countries/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/countries') ?>">Countries</a></li>
-        <li><?= e(trans($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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Country..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Country..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Country..."
-                    data-request-confirm="Do you really want to delete this country?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/countries') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/countries') ?>" class="btn btn-default">Return to countries list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/galleries/_list_toolbar.htm b/controllers/galleries/_list_toolbar.htm
deleted file mode 100644
index 4b1a3dc..0000000
--- a/controllers/galleries/_list_toolbar.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/galleries/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        New Gallery
-    </a>
-</div>
diff --git a/controllers/galleries/_posts.htm b/controllers/galleries/_posts.php
similarity index 100%
rename from controllers/galleries/_posts.htm
rename to controllers/galleries/_posts.php
diff --git a/controllers/galleries/config_list.yaml b/controllers/galleries/config_list.yaml
index ba247c0..ce5f1d4 100644
--- a/controllers/galleries/config_list.yaml
+++ b/controllers/galleries/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/gallery/columns.yaml
 modelClass: Winter\Test\Models\Gallery
 
 # List Title
-title: Manage Galleries
+title: winter.test::lang.models.gallery.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/galleries/update/:id
diff --git a/controllers/galleries/create.htm b/controllers/galleries/create.htm
deleted file mode 100644
index b4303ad..0000000
--- a/controllers/galleries/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/galleries') ?>">Galleries</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Gallery..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Gallery..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/galleries') ?>">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/test/galleries') ?>" class="btn btn-default">Return to galleries list</a></p>
-
-<?php endif ?>
diff --git a/controllers/galleries/index.htm b/controllers/galleries/index.htm
deleted file mode 100644
index 766877d..0000000
--- a/controllers/galleries/index.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<?= $this->listRender() ?>
diff --git a/controllers/galleries/preview.htm b/controllers/galleries/preview.htm
deleted file mode 100644
index 34f06fd..0000000
--- a/controllers/galleries/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/galleries') ?>">Galleries</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/test/galleries') ?>" class="btn btn-default">Return to galleries list</a></p>
-
-<?php endif ?>
diff --git a/controllers/galleries/update.htm b/controllers/galleries/update.htm
deleted file mode 100644
index ba73b6b..0000000
--- a/controllers/galleries/update.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/galleries') ?>">Galleries</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="submit"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Gallery..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Gallery..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Gallery..."
-                    data-request-confirm="Delete this gallery?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/galleries') ?>">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/test/galleries') ?>" class="btn btn-default">Return to galleries list</a></p>
-
-<?php endif ?>
diff --git a/controllers/locations/_list_toolbar.htm b/controllers/locations/_list_toolbar.htm
deleted file mode 100644
index a2db429..0000000
--- a/controllers/locations/_list_toolbar.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/locations/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        New Location
-    </a>
-
-    <button
-        class="btn btn-danger oc-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
-        data-request="onDelete"
-        data-request-confirm="Are you sure you want to delete the selected Locations?"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', 'disabled')"
-        data-stripe-load-indicator>
-        Delete selected
-    </button>
-</div>
diff --git a/controllers/locations/config_list.yaml b/controllers/locations/config_list.yaml
index 092ad8c..f9c2dea 100644
--- a/controllers/locations/config_list.yaml
+++ b/controllers/locations/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/location/columns.yaml
 modelClass: Winter\Test\Models\Location
 
 # List Title
-title: Manage Locations
+title: winter.test::lang.models.location.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/locations/update/:id
@@ -46,4 +46,4 @@ toolbar:
     search:
         prompt: backend::lang.list.search_prompt
 
-filter: config_filter.yaml
\ No newline at end of file
+filter: config_filter.yaml
diff --git a/controllers/locations/create.htm b/controllers/locations/create.htm
deleted file mode 100644
index f3561c9..0000000
--- a/controllers/locations/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/locations') ?>">Locations</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Location..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Location..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/locations') ?>">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/test/locations') ?>" class="btn btn-default">Return to locations list</a></p>
-
-<?php endif ?>
diff --git a/controllers/locations/index.htm b/controllers/locations/index.htm
deleted file mode 100644
index 766877d..0000000
--- a/controllers/locations/index.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<?= $this->listRender() ?>
diff --git a/controllers/locations/preview.htm b/controllers/locations/preview.htm
deleted file mode 100644
index 91526a8..0000000
--- a/controllers/locations/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/locations') ?>">Locations</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/test/locations') ?>" class="btn btn-default">Return to locations list</a></p>
-
-<?php endif ?>
diff --git a/controllers/locations/update.htm b/controllers/locations/update.htm
deleted file mode 100644
index 50fe526..0000000
--- a/controllers/locations/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/locations') ?>">Locations</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Location..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Location..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Location..."
-                    data-request-confirm="Delete this location?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/locations') ?>">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/test/locations') ?>" class="btn btn-default">Return to locations list</a></p>
-
-<?php endif ?>
diff --git a/controllers/members/create.htm b/controllers/members/create.htm
deleted file mode 100644
index 8597ac7..0000000
--- a/controllers/members/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Members</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Member..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Member..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/trees') ?>">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/test/trees') ?>" class="btn btn-default">Return to members list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/members/preview.htm b/controllers/members/preview.htm
deleted file mode 100644
index 50c1ebe..0000000
--- a/controllers/members/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Members</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/test/trees') ?>" class="btn btn-default">Return to members list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/members/update.htm b/controllers/members/update.htm
deleted file mode 100644
index 2b710f1..0000000
--- a/controllers/members/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/trees') ?>">Members</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Member..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Member..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Member..."
-                    data-request-confirm="Do you really want to delete this member?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/trees') ?>">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/test/trees') ?>" class="btn btn-default">Return to members list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/pages/_list_toolbar.htm b/controllers/pages/_list_toolbar.htm
deleted file mode 100644
index 4c95965..0000000
--- a/controllers/pages/_list_toolbar.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/pages/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        New Page
-    </a>
-
-    <button
-        class="btn btn-danger oc-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
-        data-request="onDelete"
-        data-request-confirm="Are you sure you want to delete the selected Pages?"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', 'disabled')"
-        data-stripe-load-indicator>
-        Delete selected
-    </button>
-</div>
diff --git a/controllers/pages/config_list.yaml b/controllers/pages/config_list.yaml
index 3bc6630..2a90dd5 100644
--- a/controllers/pages/config_list.yaml
+++ b/controllers/pages/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/page/columns.yaml
 modelClass: Winter\Test\Models\Page
 
 # List Title
-title: Manage Pages
+title: winter.test::lang.models.page.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/pages/update/:id
diff --git a/controllers/pages/create.htm b/controllers/pages/create.htm
deleted file mode 100644
index 19116c0..0000000
--- a/controllers/pages/create.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/pages') ?>">Pages</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>
-
-        <?php /*
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Page..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Page..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/pages') ?>">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/test/pages') ?>" class="btn btn-default">Return to pages list</a></p>
-
-<?php endif ?>
diff --git a/controllers/pages/index.htm b/controllers/pages/index.php
similarity index 100%
rename from controllers/pages/index.htm
rename to controllers/pages/index.php
diff --git a/controllers/pages/preview.htm b/controllers/pages/preview.htm
deleted file mode 100644
index 32f7128..0000000
--- a/controllers/pages/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/pages') ?>">Pages</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/test/pages') ?>" class="btn btn-default">Return to pages list</a></p>
-
-<?php endif ?>
diff --git a/controllers/pages/update.htm b/controllers/pages/update.htm
deleted file mode 100644
index aa59fa7..0000000
--- a/controllers/pages/update.htm
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/pages') ?>">Pages</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>
-
-        <?php /*
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Page..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Page..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Page..."
-                    data-request-confirm="Delete this page?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/pages') ?>">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/test/pages') ?>" class="btn btn-default">Return to pages list</a></p>
-
-<?php endif ?>
diff --git a/controllers/people/_datatable.htm b/controllers/people/_datatable.php
similarity index 100%
rename from controllers/people/_datatable.htm
rename to controllers/people/_datatable.php
diff --git a/controllers/people/_ajax_options.htm b/controllers/people/_field_ajax_options.php
similarity index 92%
rename from controllers/people/_ajax_options.htm
rename to controllers/people/_field_ajax_options.php
index 3e180f0..4216878 100644
--- a/controllers/people/_ajax_options.htm
+++ b/controllers/people/_field_ajax_options.php
@@ -4,4 +4,4 @@
     data-minimum-input-length="2"
     data-ajax--delay="300"
     data-request-data="foo: 'bar'"
-    ></select>
\ No newline at end of file
+    ></select>
diff --git a/controllers/people/_form_toggle.htm b/controllers/people/_form_toggle.php
similarity index 100%
rename from controllers/people/_form_toggle.htm
rename to controllers/people/_form_toggle.php
diff --git a/controllers/people/_id.htm b/controllers/people/_id.php
similarity index 100%
rename from controllers/people/_id.htm
rename to controllers/people/_id.php
diff --git a/controllers/people/_list_toolbar.htm b/controllers/people/_list_toolbar.php
similarity index 100%
rename from controllers/people/_list_toolbar.htm
rename to controllers/people/_list_toolbar.php
diff --git a/controllers/people/_name.htm b/controllers/people/_name.php
similarity index 100%
rename from controllers/people/_name.htm
rename to controllers/people/_name.php
diff --git a/controllers/people/_phone.htm b/controllers/people/_phone.php
similarity index 100%
rename from controllers/people/_phone.htm
rename to controllers/people/_phone.php
diff --git a/controllers/people/config_filter.yaml b/controllers/people/config_filter.yaml
new file mode 100644
index 0000000..fddb942
--- /dev/null
+++ b/controllers/people/config_filter.yaml
@@ -0,0 +1,77 @@
+scopes:
+    status:
+        label: Status
+        type: button-group
+        # conditions: status = :filtered
+        options:
+            all: All
+            active: Active
+            archived: Archived
+
+    status_dropdown:
+        type: dropdown
+        emptyOption: Select status
+        default: active
+        # conditions: status = :filtered
+        options:
+            all: All
+            active: Active
+            archived: Archived
+
+    status_group:
+        label: Status
+        type: group
+        # conditions: status in (:filtered)
+        options:
+            pending: Pending
+            active: Active
+            closed: Closed
+
+    published:
+        label: Hide published
+        type: checkbox
+        default: 1
+        # conditions: is_published <> true
+
+    approved:
+        label: Approved
+        type: switch
+        default: 1
+        conditions:
+            # - is_approved <> true
+            # - is_approved = true
+
+    name:
+        label: Name
+        type: text
+        conditions: name = :value
+        size: 2
+
+    expenses_min:
+        label: Expenses >=
+        type: number
+        step: 1
+        min: 0
+        max: 1000
+        conditions: expenses >= ':filtered'
+
+    expenses_range:
+        label: Expenses Range
+        type: numberrange
+        conditions: expenses >= ':min' and expenses <= ':max'
+
+    created_at:
+        label: Date after
+        type: date
+        minDate: '2001-01-23'
+        maxDate: '2030-10-13'
+        yearRange: 10
+        conditions: created_at >= ':filtered'
+
+    published_at:
+        label: Date Range
+        type: daterange
+        minDate: '2001-01-23'
+        maxDate: '2030-10-13'
+        yearRange: 10
+        conditions: created_at >= ':after' AND created_at <= ':before'
diff --git a/controllers/people/config_form.yaml b/controllers/people/config_form.yaml
index bb7e92e..03b3424 100644
--- a/controllers/people/config_form.yaml
+++ b/controllers/people/config_form.yaml
@@ -16,16 +16,16 @@ defaultRedirect: winter/test/people
 
 # Create page
 create:
-    title: Create People
+    title: Create Person
     redirect: winter/test/people/update/:id
     redirectClose: winter/test/people
 
 # Update page
 update:
-    title: Edit People
+    title: Edit Person
     redirect: winter/test/people
     redirectClose: winter/test/people
 
 # Preview page
 preview:
-    title: Preview People
\ No newline at end of file
+    title: Preview Person
diff --git a/controllers/people/config_list.yaml b/controllers/people/config_list.yaml
index feb26e0..c769e28 100644
--- a/controllers/people/config_list.yaml
+++ b/controllers/people/config_list.yaml
@@ -9,7 +9,7 @@ list: ~/plugins/winter/test/models/person/columns.yaml
 modelClass: Winter\Test\Models\Person
 
 # List Title
-title: Manage Peoples
+title: winter.test::lang.models.person.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/people/update/:id
@@ -18,7 +18,7 @@ recordUrl: winter/test/people/update/:id
 noRecordsMessage: backend::lang.list.no_records
 
 # Records to display per page
-recordsPerPage: 20
+recordsPerPage: 2
 
 # Displays the list column set up button
 showSetup: true
@@ -43,3 +43,5 @@ toolbar:
     search:
         prompt: backend::lang.list.search_prompt
         mode: any
+
+filter: config_filter.yaml
diff --git a/controllers/people/create.htm b/controllers/people/create.htm
deleted file mode 100644
index ec0fdd3..0000000
--- a/controllers/people/create.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/people') ?>">People</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?= $this->makePartial('form_toggle') ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Person..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Person..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/people') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/people') ?>" class="btn btn-default">Return to people list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/people/index.htm b/controllers/people/index.php
similarity index 100%
rename from controllers/people/index.htm
rename to controllers/people/index.php
diff --git a/controllers/people/preview.htm b/controllers/people/preview.htm
deleted file mode 100644
index 1b52ba3..0000000
--- a/controllers/people/preview.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/people') ?>">People</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= $this->makePartial('form_toggle') ?>
-
-    <div class="layout-item stretch layout-column form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/people') ?>" class="btn btn-default">Return to people list</a></p>
-
-<?php endif ?>
diff --git a/controllers/people/update.htm b/controllers/people/update.htm
deleted file mode 100644
index a446a75..0000000
--- a/controllers/people/update.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/people') ?>">People</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?= $this->makePartial('form_toggle') ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Person..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Person..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Person..."
-                    data-request-confirm="Do you really want to delete this person?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/people') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/people') ?>" class="btn btn-default">Return to people list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/phones/_form_toggle.htm b/controllers/phones/_form_toggle.php
similarity index 100%
rename from controllers/phones/_form_toggle.htm
rename to controllers/phones/_form_toggle.php
diff --git a/controllers/phones/_list_toolbar.htm b/controllers/phones/_list_toolbar.htm
deleted file mode 100644
index f2b155c..0000000
--- a/controllers/phones/_list_toolbar.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-control="toolbar">
-    <a href="<?= Backend::url('winter/test/phones/create') ?>" class="btn btn-primary oc-icon-plus">New Phone</a>
-</div>
\ No newline at end of file
diff --git a/controllers/phones/_person.htm b/controllers/phones/_person.php
similarity index 100%
rename from controllers/phones/_person.htm
rename to controllers/phones/_person.php
diff --git a/controllers/phones/config_list.yaml b/controllers/phones/config_list.yaml
index 0cfbead..2ebf015 100644
--- a/controllers/phones/config_list.yaml
+++ b/controllers/phones/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/phone/columns.yaml
 modelClass: Winter\Test\Models\Phone
 
 # List Title
-title: Manage Phones
+title: winter.test::lang.models.phone.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/phones/update/:id
diff --git a/controllers/phones/create.htm b/controllers/phones/create.htm
deleted file mode 100644
index f302c45..0000000
--- a/controllers/phones/create.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/people') ?>">People</a></li>
-        <li><a href="<?= Backend::url('winter/test/phones') ?>">Phones</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class'=>'layout']) ?>
-
-        <div class="layout-row">
-
-            <?= $this->makePartial('form_toggle') ?>
-
-            <?= $this->formRender() ?>
-
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Phone..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Phone..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/phones') ?>">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/test/phones') ?>" class="btn btn-default">Return to phones list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/phones/index.htm b/controllers/phones/index.php
similarity index 100%
rename from controllers/phones/index.htm
rename to controllers/phones/index.php
diff --git a/controllers/phones/preview.htm b/controllers/phones/preview.htm
deleted file mode 100644
index 9f1a757..0000000
--- a/controllers/phones/preview.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/people') ?>">People</a></li>
-        <li><a href="<?= Backend::url('winter/test/phones') ?>">Phones</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="layout-item stretch layout-column form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('winter/test/phones') ?>" class="btn btn-default">Return to phones list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/phones/update.htm b/controllers/phones/update.htm
deleted file mode 100644
index b3dae94..0000000
--- a/controllers/phones/update.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/people') ?>">People</a></li>
-        <li><a href="<?= Backend::url('winter/test/phones') ?>">Phones</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class'=>'layout']) ?>
-
-        <div class="layout-row">
-
-            <?= $this->makePartial('form_toggle') ?>
-
-            <?= $this->formRender() ?>
-
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Phone..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Phone..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Phone..."
-                    data-request-confirm="Do you really want to delete this phone?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/phones') ?>">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/test/phones') ?>" class="btn btn-default">Return to phones list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/plugins/_list_toolbar.htm b/controllers/plugins/_list_toolbar.htm
deleted file mode 100644
index 6248f92..0000000
--- a/controllers/plugins/_list_toolbar.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/plugins/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        New Plugin
-    </a>
-</div>
\ No newline at end of file
diff --git a/controllers/plugins/config_list.yaml b/controllers/plugins/config_list.yaml
index 0b8b7b7..5e761ad 100644
--- a/controllers/plugins/config_list.yaml
+++ b/controllers/plugins/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/plugin/columns.yaml
 modelClass: Winter\Test\Models\Plugin
 
 # List Title
-title: Manage Plugins
+title: winter.test::lang.models.plugin.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/plugins/update/:id
diff --git a/controllers/plugins/create.htm b/controllers/plugins/create.htm
deleted file mode 100644
index 462c6cd..0000000
--- a/controllers/plugins/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/plugins') ?>">Plugins</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Plugin..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Plugin..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/plugins') ?>">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/test/plugins') ?>" class="btn btn-default">Return to plugins list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/plugins/index.htm b/controllers/plugins/index.htm
deleted file mode 100644
index 766877d..0000000
--- a/controllers/plugins/index.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<?= $this->listRender() ?>
diff --git a/controllers/plugins/preview.htm b/controllers/plugins/preview.htm
deleted file mode 100644
index bf9ae9e..0000000
--- a/controllers/plugins/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/plugins') ?>">Plugins</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/test/plugins') ?>" class="btn btn-default">Return to plugins list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/plugins/update.htm b/controllers/plugins/update.htm
deleted file mode 100644
index bd16ef5..0000000
--- a/controllers/plugins/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/plugins') ?>">Plugins</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Plugin..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Plugin..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Plugin..."
-                    data-request-confirm="Do you really want to delete this plugin?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/plugins') ?>">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/test/plugins') ?>" class="btn btn-default">Return to plugins list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/posts/_comments.htm b/controllers/posts/_comments.php
similarity index 100%
rename from controllers/posts/_comments.htm
rename to controllers/posts/_comments.php
diff --git a/controllers/posts/_create_form.htm b/controllers/posts/_create_form.php
similarity index 100%
rename from controllers/posts/_create_form.htm
rename to controllers/posts/_create_form.php
diff --git a/controllers/posts/_delete_reason_form.htm b/controllers/posts/_delete_reason_form.php
similarity index 100%
rename from controllers/posts/_delete_reason_form.htm
rename to controllers/posts/_delete_reason_form.php
diff --git a/controllers/posts/_error_button.htm b/controllers/posts/_error_button.php
similarity index 100%
rename from controllers/posts/_error_button.htm
rename to controllers/posts/_error_button.php
diff --git a/controllers/posts/_form_toggle.htm b/controllers/posts/_form_toggle.php
similarity index 100%
rename from controllers/posts/_form_toggle.htm
rename to controllers/posts/_form_toggle.php
diff --git a/controllers/posts/_galleries.htm b/controllers/posts/_galleries.php
similarity index 100%
rename from controllers/posts/_galleries.htm
rename to controllers/posts/_galleries.php
diff --git a/controllers/posts/_list_comments_toolbar.htm b/controllers/posts/_list_comments_toolbar.php
similarity index 100%
rename from controllers/posts/_list_comments_toolbar.htm
rename to controllers/posts/_list_comments_toolbar.php
diff --git a/controllers/posts/_list_posts_toolbar.htm b/controllers/posts/_list_posts_toolbar.php
similarity index 100%
rename from controllers/posts/_list_posts_toolbar.htm
rename to controllers/posts/_list_posts_toolbar.php
diff --git a/controllers/posts/_list_tags_toolbar.htm b/controllers/posts/_list_tags_toolbar.php
similarity index 100%
rename from controllers/posts/_list_tags_toolbar.htm
rename to controllers/posts/_list_tags_toolbar.php
diff --git a/controllers/posts/_review.htm b/controllers/posts/_review.php
similarity index 100%
rename from controllers/posts/_review.htm
rename to controllers/posts/_review.php
diff --git a/controllers/posts/_status.htm b/controllers/posts/_status.php
similarity index 100%
rename from controllers/posts/_status.htm
rename to controllers/posts/_status.php
diff --git a/controllers/posts/_update_form.htm b/controllers/posts/_update_form.php
similarity index 100%
rename from controllers/posts/_update_form.htm
rename to controllers/posts/_update_form.php
diff --git a/controllers/posts/config_comment_form.yaml b/controllers/posts/config_comment_form.yaml
index c57e460..6e31800 100644
--- a/controllers/posts/config_comment_form.yaml
+++ b/controllers/posts/config_comment_form.yaml
@@ -16,16 +16,16 @@ defaultRedirect: winter/test/posts
 
 # Create page
 create:
-    title: Create Comments
+    title: Create Comment
     redirect: winter/test/posts/update/:id
     redirectClose: winter/test/posts
 
 # Update page
 update:
-    title: Edit Comments
+    title: Edit Comment
     redirect: winter/test/posts
     redirectClose: winter/test/posts
 
 # Preview page
 preview:
-    title: Preview Comments
+    title: Preview Comment
diff --git a/controllers/posts/config_post_form.yaml b/controllers/posts/config_post_form.yaml
index 1e19259..16abdb2 100644
--- a/controllers/posts/config_post_form.yaml
+++ b/controllers/posts/config_post_form.yaml
@@ -16,16 +16,16 @@ defaultRedirect: winter/test/posts
 
 # Create page
 create:
-    title: Create Posts
+    title: Create Post
     redirect: winter/test/posts/update/:id
     redirectClose: winter/test/posts
 
 # Update page
 update:
-    title: Edit Posts
+    title: Edit Post
     redirect: winter/test/posts
     redirectClose: winter/test/posts
 
 # Preview page
 preview:
-    title: Preview Posts
\ No newline at end of file
+    title: Preview Post
diff --git a/controllers/posts/config_tag_form.yaml b/controllers/posts/config_tag_form.yaml
index 093bf49..a2c289e 100644
--- a/controllers/posts/config_tag_form.yaml
+++ b/controllers/posts/config_tag_form.yaml
@@ -16,16 +16,16 @@ defaultRedirect: winter/test/posts
 
 # Create page
 create:
-    title: Create Tags
+    title: Create Tag
     redirect: winter/test/tags/update/:id
     redirectClose: winter/test/tags
 
 # Update page
 update:
-    title: Edit Tags
+    title: Edit Tag
     redirect: winter/test/tags
     redirectClose: winter/test/tags
 
 # Preview page
 preview:
-    title: Preview Tags
+    title: Preview Tag
diff --git a/controllers/posts/create.htm b/controllers/posts/create.htm
deleted file mode 100644
index e417ffd..0000000
--- a/controllers/posts/create.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/posts') ?>">Posts</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?= $this->makePartial('form_toggle') ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Post..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Post..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/posts') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/posts') ?>" class="btn btn-default">Return to posts list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/posts/index.htm b/controllers/posts/index.php
similarity index 100%
rename from controllers/posts/index.htm
rename to controllers/posts/index.php
diff --git a/controllers/posts/preview.htm b/controllers/posts/preview.htm
deleted file mode 100644
index 6bbaa84..0000000
--- a/controllers/posts/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/posts') ?>">Posts</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="layout-item stretch layout-column form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/posts') ?>" class="btn btn-default">Return to posts list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/posts/update.htm b/controllers/posts/update.htm
deleted file mode 100644
index 01e837d..0000000
--- a/controllers/posts/update.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/posts') ?>">Posts</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?= $this->makePartial('form_toggle') ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Post..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Post..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-control="popup"
-                    data-size="large"
-                    data-handler="onLoadDeleteReasonForm">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/posts') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/posts') ?>" class="btn btn-default">Return to posts list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/records/_basic_popup.php b/controllers/records/_basic_popup.php
new file mode 100644
index 0000000..20a1702
--- /dev/null
+++ b/controllers/records/_basic_popup.php
@@ -0,0 +1,17 @@
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="popup">&times;</button>
+    <h4 class="modal-title">Popup Title</h4>
+</div>
+<div class="modal-body">
+    <p>
+        Popup Contents
+    </p>
+</div>
+<div class="modal-footer">
+    <button
+        type="button"
+        class="btn btn-default"
+        data-dismiss="popup">
+        <?= e(trans('backend::lang.form.close')) ?>
+    </button>
+</div>
diff --git a/models/record/field.hint.php b/controllers/records/_field_hint.php
similarity index 100%
rename from models/record/field.hint.php
rename to controllers/records/_field_hint.php
diff --git a/models/record/field.partial.php b/controllers/records/_field_partial.php
similarity index 100%
rename from models/record/field.partial.php
rename to controllers/records/_field_partial.php
diff --git a/controllers/records/_form_toolbar.php b/controllers/records/_form_toolbar.php
deleted file mode 100644
index d39db43..0000000
--- a/controllers/records/_form_toolbar.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-    $isPreview = $this->formGetContext() === 'preview';
-    $isCreate = $this->formGetContext() === 'create';
-    $pageUrl = isset($pageUrl) ? $pageUrl : null;
-    $indexUrl = Backend::url('winter/test/records');
-?>
-<div class="form-buttons loading-indicator-container">
-    <?php if ($isPreview) : ?>
-        <span class="btn-text">
-            <a href="<?= $indexUrl ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-        </span>
-    <?php else : ?>
-        <!-- Save -->
-        <a
-            href="javascript:;"
-            class="btn btn-primary oc-icon-check save"
-            data-request="onSave"
-            data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-            <?php if (!$isCreate) : ?>
-                data-request-data="redirect:0"
-            <?php endif ?>
-            data-hotkey="ctrl+s, cmd+s">
-                <?= e(trans('backend::lang.form.save')) ?>
-        </a>
-
-        <?php if (!$isCreate) : ?>
-            <!-- Save and Close -->
-            <a
-                href="javascript:;"
-                class="btn btn-primary oc-icon-check save"
-                data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                data-request="onSave"
-                data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>">
-                    <?= e(trans('backend::lang.form.save_and_close')) ?>
-            </a>
-        <?php endif ?>
-
-        <span class="btn-text">
-            or <a href="<?= $indexUrl ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-        </span>
-
-        <!-- Preview -->
-        <a
-            href="<?= URL::to($pageUrl) ?>"
-            target="_blank"
-            class="btn btn-primary oc-icon-crosshairs
-            <?php if (!false) : ?>
-                hide
-            <?php endif ?>"
-            data-control="preview-button">
-                <?= e(trans('backend::lang.form.preview_title')) ?>
-        </a>
-
-        <?php if (!$isCreate) : ?>
-            <!-- Delete -->
-            <button
-                type="button"
-                class="btn btn-default empty oc-icon-trash-o"
-                data-request="onDelete"
-                data-request-confirm="<?= e(trans('ca::lang.actions.delete_confirm')) ?>"
-                data-control="delete-button"></button>
-        <?php endif ?>
-    <?php endif; ?>
-</div>
diff --git a/controllers/records/_list_toolbar.php b/controllers/records/_list_toolbar.php
deleted file mode 100644
index 53276e2..0000000
--- a/controllers/records/_list_toolbar.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/records/create') ?>"
-        class="btn btn-primary wn-icon-plus">
-        <?= e(trans('backend::lang.form.create_title', ['name' => trans('winter.test::lang.models.record.label')])); ?>
-    </a>
-
-    <button
-        class="btn btn-danger wn-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
-        data-request="onDelete"
-        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')); ?>"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', 'disabled')"
-        data-stripe-load-indicator>
-        <?= e(trans('backend::lang.list.delete_selected')); ?>
-    </button>
-</div>
diff --git a/controllers/records/config_list.yaml b/controllers/records/config_list.yaml
index 05437fc..a30bec3 100644
--- a/controllers/records/config_list.yaml
+++ b/controllers/records/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/record/columns.yaml
 modelClass: Winter\Test\Models\Record
 
 # List Title
-title: 'winter.test::lang.models.record.label_plural'
+title: winter.test::lang.models.record.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/records/update/:id
diff --git a/controllers/records/create.php b/controllers/records/create.php
deleted file mode 100644
index 9a92adf..0000000
--- a/controllers/records/create.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php if (!$this->fatalError): ?>
-
-    <div class="layout fancy-layout">
-        <?= Form::open([
-            'class' => 'layout',
-            'data-change-monitor' => 'true',
-            'data-window-close-confirm' => e(trans('winter.test::lang.general.unsaved_changes')),
-        ]) ?>
-
-            <?= $this->formRender() ?>
-
-        <?= Form::close() ?>
-    </div>
-
-<?php else: ?>
-
-    <div class="control-breadcrumb">
-        <?= Block::placeholder('breadcrumb') ?>
-    </div>
-    <div class="padded-container">
-        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-        <p><a href="<?= Backend::url('winter/test/records') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-    </div>
-
-<?php endif ?>
diff --git a/controllers/records/index.php b/controllers/records/index.php
deleted file mode 100644
index ea43a36..0000000
--- a/controllers/records/index.php
+++ /dev/null
@@ -1 +0,0 @@
-<?= $this->listRender() ?>
diff --git a/controllers/records/preview.php b/controllers/records/preview.php
deleted file mode 100644
index 67320eb..0000000
--- a/controllers/records/preview.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/records') ?>"><?= e(trans('winter.test::lang.models.record.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/test/records') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
-<?php endif ?>
diff --git a/controllers/records/update.php b/controllers/records/update.php
deleted file mode 100644
index 9a92adf..0000000
--- a/controllers/records/update.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php if (!$this->fatalError): ?>
-
-    <div class="layout fancy-layout">
-        <?= Form::open([
-            'class' => 'layout',
-            'data-change-monitor' => 'true',
-            'data-window-close-confirm' => e(trans('winter.test::lang.general.unsaved_changes')),
-        ]) ?>
-
-            <?= $this->formRender() ?>
-
-        <?= Form::close() ?>
-    </div>
-
-<?php else: ?>
-
-    <div class="control-breadcrumb">
-        <?= Block::placeholder('breadcrumb') ?>
-    </div>
-    <div class="padded-container">
-        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-        <p><a href="<?= Backend::url('winter/test/records') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-    </div>
-
-<?php endif ?>
diff --git a/models/review/_rating_field.htm b/controllers/reviews/_field_rating.php
similarity index 100%
rename from models/review/_rating_field.htm
rename to controllers/reviews/_field_rating.php
diff --git a/controllers/reviews/_form_orphan.php b/controllers/reviews/_form_orphan.php
new file mode 100644
index 0000000..ef4c85d
--- /dev/null
+++ b/controllers/reviews/_form_orphan.php
@@ -0,0 +1,20 @@
+        <?php if ($formModel->product): ?>
+            <div class="scoreboard">
+                <div data-control="toolbar">
+                    <div class="scoreboard-item title-value">
+                        <h4>Product</h4>
+                        <p><?= $formModel->product->name ?></p>
+                        <p class="description">type: <?= class_basename($formModel->product) ?></p>
+                    </div>
+                </div>
+            </div>
+        <?php else: ?>
+            <div class="callout fade in callout-warning no-icon no-subheader">
+                <div class="header">
+                    <h3>Orphan detected</h3>
+                </div>
+                <div class="content">
+                    <p>This review is an orphan</p>
+                </div>
+            </div>
+        <?php endif ?>
diff --git a/controllers/reviews/_list_container.htm b/controllers/reviews/_list_container.php
similarity index 100%
rename from controllers/reviews/_list_container.htm
rename to controllers/reviews/_list_container.php
diff --git a/controllers/reviews/_list_toolbar.htm b/controllers/reviews/_list_toolbar.php
similarity index 100%
rename from controllers/reviews/_list_toolbar.htm
rename to controllers/reviews/_list_toolbar.php
diff --git a/controllers/reviews/_small_image.htm b/controllers/reviews/_small_image.php
similarity index 100%
rename from controllers/reviews/_small_image.htm
rename to controllers/reviews/_small_image.php
diff --git a/controllers/reviews/config_list.yaml b/controllers/reviews/config_list.yaml
index 0ff4ba8..5d99800 100644
--- a/controllers/reviews/config_list.yaml
+++ b/controllers/reviews/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/review/columns.yaml
 modelClass: Winter\Test\Models\Review
 
 # List Title
-title: Manage Reviews
+title: winter.test::lang.models.review.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/reviews/update/:id
diff --git a/controllers/reviews/create.htm b/controllers/reviews/create.htm
deleted file mode 100644
index 088466d..0000000
--- a/controllers/reviews/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/reviews') ?>">Reviews</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Review..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Review..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/reviews') ?>">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/test/reviews') ?>" class="btn btn-default">Return to reviews list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/reviews/index.htm b/controllers/reviews/index.php
similarity index 100%
rename from controllers/reviews/index.htm
rename to controllers/reviews/index.php
diff --git a/controllers/reviews/list/_list_body_row.htm b/controllers/reviews/list/_list_body_row.php
similarity index 100%
rename from controllers/reviews/list/_list_body_row.htm
rename to controllers/reviews/list/_list_body_row.php
diff --git a/controllers/reviews/preview.htm b/controllers/reviews/preview.htm
deleted file mode 100644
index e593633..0000000
--- a/controllers/reviews/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/reviews') ?>">Reviews</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/test/reviews') ?>" class="btn btn-default">Return to reviews list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/reviews/update.htm b/controllers/reviews/update.htm
deleted file mode 100644
index e70cadb..0000000
--- a/controllers/reviews/update.htm
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/reviews') ?>">Reviews</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?php if ($formModel->product): ?>
-            <div class="scoreboard">
-                <div data-control="toolbar">
-                    <div class="scoreboard-item title-value">
-                        <h4>Product</h4>
-                        <p><?= $formModel->product->name ?></p>
-                        <p class="description">type: <?= class_basename($formModel->product) ?></p>
-                    </div>
-                </div>
-            </div>
-        <?php else: ?>
-            <div class="callout fade in callout-warning no-icon no-subheader">
-                <div class="header">
-                    <h3>Orphan detected</h3>
-                </div>
-                <div class="content">
-                    <p>This review is an orphan</p>
-                </div>
-            </div>
-        <?php endif ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Review..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Review..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Review..."
-                    data-request-confirm="Do you really want to delete this review?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/reviews') ?>">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/test/reviews') ?>" class="btn btn-default">Return to reviews list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/themes/_list_toolbar.htm b/controllers/themes/_list_toolbar.htm
deleted file mode 100644
index c583b24..0000000
--- a/controllers/themes/_list_toolbar.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<div data-control="toolbar">
-    <a
-        href="<?= Backend::url('winter/test/themes/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        New Theme
-    </a>
-</div>
\ No newline at end of file
diff --git a/controllers/themes/config_list.yaml b/controllers/themes/config_list.yaml
index 1939604..54d6daf 100644
--- a/controllers/themes/config_list.yaml
+++ b/controllers/themes/config_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/theme/columns.yaml
 modelClass: Winter\Test\Models\Theme
 
 # List Title
-title: Manage Themes
+title: winter.test::lang.models.theme.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/themes/update/:id
diff --git a/controllers/themes/create.htm b/controllers/themes/create.htm
deleted file mode 100644
index fbfbdbe..0000000
--- a/controllers/themes/create.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/themes') ?>">Themes</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="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating Theme..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating Theme..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/themes') ?>">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/test/themes') ?>" class="btn btn-default">Return to themes list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/themes/index.htm b/controllers/themes/index.htm
deleted file mode 100644
index 766877d..0000000
--- a/controllers/themes/index.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<?= $this->listRender() ?>
diff --git a/controllers/cities/index.htm b/controllers/themes/index.php
similarity index 100%
rename from controllers/cities/index.htm
rename to controllers/themes/index.php
diff --git a/controllers/themes/preview.htm b/controllers/themes/preview.htm
deleted file mode 100644
index ae73525..0000000
--- a/controllers/themes/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/themes') ?>">Themes</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/test/themes') ?>" class="btn btn-default">Return to themes list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/themes/update.htm b/controllers/themes/update.htm
deleted file mode 100644
index 78fbe8d..0000000
--- a/controllers/themes/update.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/themes') ?>">Themes</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="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving Theme..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving Theme..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting Theme..."
-                    data-request-confirm="Do you really want to delete this theme?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/themes') ?>">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/test/themes') ?>" class="btn btn-default">Return to themes list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/trees/_list_categories_toolbar.htm b/controllers/trees/_list_categories_toolbar.php
similarity index 84%
rename from controllers/trees/_list_categories_toolbar.htm
rename to controllers/trees/_list_categories_toolbar.php
index 0b1dbd1..bda1b46 100644
--- a/controllers/trees/_list_categories_toolbar.htm
+++ b/controllers/trees/_list_categories_toolbar.php
@@ -2,11 +2,11 @@
     <a
         href="<?= Backend::url('winter/test/categories/create') ?>"
         class="btn btn-primary oc-icon-plus">
-        New
+        New Category
     </a>
     <a
         href="<?= Backend::url('winter/test/categories/reorder') ?>"
         class="btn btn-default oc-icon-bars">
-        Reorder
+        Reorder Categories
     </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/controllers/trees/_list_channels_toolbar.htm b/controllers/trees/_list_channels_toolbar.php
similarity index 84%
rename from controllers/trees/_list_channels_toolbar.htm
rename to controllers/trees/_list_channels_toolbar.php
index f4b71e0..85ca8b4 100644
--- a/controllers/trees/_list_channels_toolbar.htm
+++ b/controllers/trees/_list_channels_toolbar.php
@@ -2,11 +2,11 @@
     <a
         href="<?= Backend::url('winter/test/channels/create') ?>"
         class="btn btn-primary oc-icon-plus">
-        New
+        New Channel
     </a>
     <a
         href="<?= Backend::url('winter/test/channels/reorder') ?>"
         class="btn btn-default oc-icon-bars">
-        Reorder
+        Reorder Channels
     </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/controllers/trees/_list_members_toolbar.htm b/controllers/trees/_list_members_toolbar.php
similarity index 85%
rename from controllers/trees/_list_members_toolbar.htm
rename to controllers/trees/_list_members_toolbar.php
index 3fb1c33..36e18f5 100644
--- a/controllers/trees/_list_members_toolbar.htm
+++ b/controllers/trees/_list_members_toolbar.php
@@ -2,6 +2,6 @@
     <a
         href="<?= Backend::url('winter/test/members/create') ?>"
         class="btn btn-primary oc-icon-plus">
-        New
+        New Member
     </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/controllers/trees/config_channels_list.yaml b/controllers/trees/config_channels_list.yaml
index 87e3936..bc9aad8 100644
--- a/controllers/trees/config_channels_list.yaml
+++ b/controllers/trees/config_channels_list.yaml
@@ -9,7 +9,7 @@ list: $/winter/test/models/channel/columns.yaml
 modelClass: Winter\Test\Models\Channel
 
 # List Title
-title: Manage Channels
+title: winter.test::lang.models.channel.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/channels/update/:id
diff --git a/controllers/trees/index.htm b/controllers/trees/index.php
similarity index 100%
rename from controllers/trees/index.htm
rename to controllers/trees/index.php
diff --git a/controllers/users/_field_uppercase_name.htm b/controllers/users/_field_uppercase_name.php
similarity index 100%
rename from controllers/users/_field_uppercase_name.htm
rename to controllers/users/_field_uppercase_name.php
diff --git a/controllers/users/_form_toggle.htm b/controllers/users/_form_toggle.php
similarity index 100%
rename from controllers/users/_form_toggle.htm
rename to controllers/users/_form_toggle.php
diff --git a/controllers/users/_list_toolbar.htm b/controllers/users/_list_toolbar.htm
deleted file mode 100644
index 4ca85a6..0000000
--- a/controllers/users/_list_toolbar.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-control="toolbar">
-    <a href="<?= Backend::url('winter/test/users/create') ?>" class="btn btn-primary oc-icon-plus">New User</a>
-</div>
\ No newline at end of file
diff --git a/controllers/users/_roles.htm b/controllers/users/_roles.php
similarity index 100%
rename from controllers/users/_roles.htm
rename to controllers/users/_roles.php
diff --git a/controllers/users/_roles_pivot.htm b/controllers/users/_roles_pivot.php
similarity index 100%
rename from controllers/users/_roles_pivot.htm
rename to controllers/users/_roles_pivot.php
diff --git a/controllers/users/_roles_pivot_model.htm b/controllers/users/_roles_pivot_model.php
similarity index 100%
rename from controllers/users/_roles_pivot_model.htm
rename to controllers/users/_roles_pivot_model.php
diff --git a/controllers/users/config_form.yaml b/controllers/users/config_form.yaml
index 94f6dce..4c03af8 100644
--- a/controllers/users/config_form.yaml
+++ b/controllers/users/config_form.yaml
@@ -16,16 +16,16 @@ defaultRedirect: winter/test/users
 
 # Create page
 create:
-    title: Create Users
+    title: Create User
     redirect: winter/test/users/update/:id
     redirectClose: winter/test/users
 
 # Update page
 update:
-    title: Edit Users
+    title: Edit User
     redirect: winter/test/users
     redirectClose: winter/test/users
 
 # Preview page
 preview:
-    title: Preview Users
\ No newline at end of file
+    title: Preview User
diff --git a/controllers/users/config_list.yaml b/controllers/users/config_list.yaml
index ac11309..2a32987 100644
--- a/controllers/users/config_list.yaml
+++ b/controllers/users/config_list.yaml
@@ -9,7 +9,7 @@ list: ~/plugins/winter/test/models/user/columns.yaml
 modelClass: Winter\Test\Models\User
 
 # List Title
-title: Manage Users
+title: winter.test::lang.models.user.label_plural
 
 # Link URL for each record
 recordUrl: winter/test/users/update/:id
diff --git a/controllers/users/create.htm b/controllers/users/create.htm
deleted file mode 100644
index bf21634..0000000
--- a/controllers/users/create.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/users') ?>">Users</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?= $this->makePartial('form_toggle') ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating User..."
-                    class="btn btn-primary">
-                    Create
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Creating User..."
-                    class="btn btn-default">
-                    Create and Close
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/users') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/users') ?>" class="btn btn-default">Return to users list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/users/index.htm b/controllers/users/index.php
similarity index 100%
rename from controllers/users/index.htm
rename to controllers/users/index.php
diff --git a/controllers/users/preview.htm b/controllers/users/preview.htm
deleted file mode 100644
index 6407c99..0000000
--- a/controllers/users/preview.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/users') ?>">Users</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="layout-item stretch layout-column form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/users') ?>" class="btn btn-default">Return to users list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/controllers/users/update.htm b/controllers/users/update.htm
deleted file mode 100644
index 2b1faf4..0000000
--- a/controllers/users/update.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('winter/test/users') ?>">Users</a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <?= $this->makePartial('form_toggle') ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving User..."
-                    class="btn btn-primary">
-                    <u>S</u>ave
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="Saving User..."
-                    class="btn btn-default">
-                    Save and Close
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="Deleting User..."
-                    data-request-confirm="Do you really want to delete this user?">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('winter/test/users') ?>">Cancel</a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('winter/test/users') ?>" class="btn btn-default">Return to users list</a></p>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 6729e11..2bef2d2 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -14,10 +14,62 @@
             'updated_at' => 'Updated At',
             'deleted_at' => 'Archived At',
         ],
+        'channel' => [
+            'label' => 'Channel',
+            'label_plural' => 'Channels',
+        ],
+        'city' => [
+            'label' => 'City',
+            'label_plural' => 'Cities',
+        ],
+        'country' => [
+            'label' => 'Country',
+            'label_plural' => 'Countries',
+        ],
+        'gallery' => [
+            'label' => 'Gallery',
+            'label_plural' => 'Galleries',
+        ],
+        'location' => [
+            'label' => 'Location',
+            'label_plural' => 'Locations',
+        ],
+        'page' => [
+            'label' => 'Page',
+            'label_plural' => 'Pages',
+        ],
+        'person' => [
+            'label' => 'Person',
+            'label_plural' => 'People',
+        ],
+        'phone' => [
+            'label' => 'Phone',
+            'label_plural' => 'Phones',
+        ],
+        'plugin' => [
+            'label' => 'Plugin',
+            'label_plural' => 'Plugins',
+        ],
+        'post' => [
+            'label' => 'Post',
+            'label_plural' => 'Posts',
+        ],
         'record' => [
             'label' => 'Record',
             'label_plural' => 'Records',
         ],
+        'review' => [
+            'label' => 'Review',
+            'label_plural' => 'Reviews',
+        ],
+        'theme' => [
+            'label' => 'Theme',
+            'label_plural' => 'Themes',
+        ],
+        'tree' => [
+            'label' => 'Tree',
+            'label_plural' => 'Trees',
+        ],
         'user' => [
             'label' => 'User',
             'label_plural' => 'Users',
diff --git a/models/city/fields.yaml b/models/city/fields.yaml
index 85d053a..a76f430 100644
--- a/models/city/fields.yaml
+++ b/models/city/fields.yaml
@@ -19,4 +19,4 @@ fields:
     _inspector:
         label: City information
         type: partial
-        path: ~/plugins/winter/test/models/city/_inspector_field.htm
+        path: field_inspector
diff --git a/models/meta/fields.yaml b/models/meta/fields.yaml
index 14c97e4..8828005 100644
--- a/models/meta/fields.yaml
+++ b/models/meta/fields.yaml
@@ -42,7 +42,6 @@ fields:
         label: Robot follow
         type: dropdown
         default: follow
-        default: index
         span: right
         options:
             follow: Follow
diff --git a/models/page/_toolbar.htm b/models/page/_toolbar.htm
deleted file mode 100644
index b2185de..0000000
--- a/models/page/_toolbar.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="form-buttons loading-indicator-container">
-    <a
-        type="submit"
-        data-request="onSave"
-        data-hotkey="ctrl+s, cmd+s"
-        data-load-indicator="Saving..."
-        class="btn btn-primary wn-icon-check save">
-        Save
-    </a>
-
-    <?php if ($this->formGetContext() !== 'create'): ?>
-        <a
-            type="button"
-            class="btn btn-default wn-icon-trash-o delete"
-            data-request="onDelete"
-            data-load-indicator="Deleting Page..."
-            data-request-confirm="Delete this page?">
-        </a>
-    <?php endif ?>
-</div>
diff --git a/models/page/fields.yaml b/models/page/fields.yaml
index a65caa1..70a1129 100644
--- a/models/page/fields.yaml
+++ b/models/page/fields.yaml
@@ -18,7 +18,6 @@ fields:
     toolbar:
         label: false
         type: partial
-        path: $/winter/test/models/page/_toolbar.htm
 
 tabs:
     cssClass: master-area
diff --git a/models/person/columns.yaml b/models/person/columns.yaml
index b14d7ea..c7bae62 100644
--- a/models/person/columns.yaml
+++ b/models/person/columns.yaml
@@ -21,11 +21,14 @@ columns:
     expenses:
         label: Expenses
         format: $ %.2f
+        type: number
+        summable: true
 
     phone:
         label: Phone
         relation: phone
         select: number
+        sortable: false
 
     birth:
         label: Born
diff --git a/models/person/fields.yaml b/models/person/fields.yaml
index d9e9b84..276a5c1 100644
--- a/models/person/fields.yaml
+++ b/models/person/fields.yaml
@@ -8,6 +8,11 @@
 # ===================================
 
 fields:
+    _form_toggle:
+      type: partial
+      path: form_toggle
+      context: [create,update]
+
     name:
         label: Name
         commentAbove: Text field, required. Given name in the first box, preferred name in the second box.
@@ -27,8 +32,8 @@ fields:
     ajax_options:
         label: AJAX Options
         comment: These options should be populated using AJAX
-        path: $/winter/test/controllers/people/_ajax_options.htm
         type: partial
+        path: field_ajax_options
 
     # Record Finder (Default)
     phone:
diff --git a/models/phone/fields.yaml b/models/phone/fields.yaml
index 5171dd5..3a6833c 100644
--- a/models/phone/fields.yaml
+++ b/models/phone/fields.yaml
@@ -4,6 +4,11 @@
 
 fields:
 
+    _form_toggle:
+      type: partial
+      path: form_toggle
+      context: [create,update]
+
     name:
         label: Name
 
diff --git a/models/post/fields.yaml b/models/post/fields.yaml
index eba2c90..0c1fbf8 100644
--- a/models/post/fields.yaml
+++ b/models/post/fields.yaml
@@ -4,6 +4,11 @@
 
 fields:
 
+    _form_toggle:
+      type: partial
+      path: form_toggle
+      context: [create,update]
+
     name:
         label: Name
         commentAbove: Text field, <a href="#">required</a>.
diff --git a/models/record/fields.yaml b/models/record/fields.yaml
index 63cb2a8..be0107a 100644
--- a/models/record/fields.yaml
+++ b/models/record/fields.yaml
@@ -21,7 +21,7 @@ fields:
         disabled: true
         span: right
 
-    form_toolbar:
+    toolbar:
         type: partial
         span: full
 
@@ -209,9 +209,43 @@ secondaryTabs:
             tab: Basic Fields
             label: Section
             type: section
-            span: auto
+            span: full
             commentAbove: Demonstration of a <a href="https://wintercms.com/docs/backend/forms/#section" target="_blank"><code>section</code></a> field
             commentHtml: true
+        _button_button:
+            tab: Basic Fields
+            span: auto
+            label: Button (button action)
+            commentAbove: Demonstration of a <a href="https://wintercms.com/docs/backend/forms/#button" target="_blank"><code>button (button)</code></a> field
+            commentHtml: true
+            type: button
+            buttonLabel: Triggers AJAX request
+            request: onBasicButton
+            icon: 'icon-cog'
+            loading: Working...
+        _button_link:
+            tab: Basic Fields
+            span: auto
+            label: Button (link action)
+            commentAbove: Demonstration of a <a href="https://wintercms.com/docs/backend/forms/#button" target="_blank"><code>button (link)</code></a> field
+            commentHtml: true
+            type: button
+            buttonLabel: Opens URL
+            buttonType: link
+            href: 'https://example.com/'
+            icon: icon-link
+            target: blank
+        _button_popup:
+            tab: Basic Fields
+            span: auto
+            label: Button (popup action)
+            commentAbove: Demonstration of a <a href="https://wintercms.com/docs/backend/forms/#button" target="_blank"><code>button (popup)</code></a> field
+            commentHtml: true
+            type: button
+            buttonLabel: Opens Popup
+            buttonType: danger
+            handler: onRenderBasicPopup
+            icon: icon-up-right-from-square
 
         ##
         ## FormWidgets
@@ -443,7 +477,8 @@ secondaryTabs:
                         label: Description
                         type: textarea
                         size: small
-        blocks:
+
+        additional_data[blocks]:
             label: Grouped Repeater
             tab: Repeater
             type: repeater
@@ -547,9 +582,8 @@ secondaryTabs:
             span: right
             type: datepicker
             mode: datetime
-            required: true # used because the validation rule is required_if
+            required: false
             trigger:
                 field: status
                 condition: value[published]
                 action: show
-
diff --git a/models/review/fields.yaml b/models/review/fields.yaml
index ddab204..f16e867 100644
--- a/models/review/fields.yaml
+++ b/models/review/fields.yaml
@@ -3,6 +3,11 @@
 # ===================================
 
 fields:
+    _form_orphan:
+      type: partial
+      path: form_orphan
+      context: [update]
+
     content:
         label: Content
         type: textarea
@@ -27,7 +32,7 @@ fields:
     _rating_display:
         label: false
         type: partial
-        path: $/winter/test/models/review/_rating_field.htm
+        path: field_rating
         dependsOn: rating
         span: right
 
diff --git a/models/user/fields.yaml b/models/user/fields.yaml
index 34e8731..3cac337 100644
--- a/models/user/fields.yaml
+++ b/models/user/fields.yaml
@@ -3,6 +3,11 @@
 # ===================================
 
 fields:
+    _form_toggle:
+      type: partial
+      path: form_toggle
+      context: [create,update]
+
     username:
         label: Username
         span: auto