diff --git a/app/Helpers/Template.php b/app/Helpers/Template.php
index b0fef70f..a085d384 100644
--- a/app/Helpers/Template.php
+++ b/app/Helpers/Template.php
@@ -74,4 +74,17 @@ class Template
 
         return config('app.url') . '/assets/' . config('app.theme') . '/' . $path;
     }
+
+    public static function date($datestamp, $withTime = true)
+    {
+        $timestamp = strtotime($datestamp);
+
+        if ($timestamp <= 0) {
+            return '';
+        }
+
+        $format = $withTime ? config('app.datetime_format') : config('app.date_format');
+
+        return date($format, $timestamp);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/ContentOverview.php b/app/Http/Controllers/Admin/ContentOverview.php
index 95954ec4..d6b95f39 100644
--- a/app/Http/Controllers/Admin/ContentOverview.php
+++ b/app/Http/Controllers/Admin/ContentOverview.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers\Admin;
 
+use App\Enumerations\ContentStatuses;
 use App\Models\Content;
 use App\Models\Module;
 use Illuminate\Support\Facades\Input;
@@ -45,6 +46,11 @@ class ContentOverview extends Controller
         // get homepage - for checking if homepage is set and available
         $homepage = $this->content->getHomepage();
 
-        return view('admin.content.overview', ['pages' => $pages, 'homepage' => $homepage]);
+        return view('admin.content.overview', [
+            'pages'    => $pages,
+            'homepage' => $homepage,
+            'statuses' => ContentStatuses::getWithTranslations(),
+            'module' => isset($module) ? $module : null
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/Models/Content.php b/app/Models/Content.php
index 4fec44d0..8d13ee10 100644
--- a/app/Models/Content.php
+++ b/app/Models/Content.php
@@ -185,7 +185,7 @@ class Content extends Model
     public function getOverview($handler = false, $status = false, $joinAuthor = false, $joinParent = false)
     {
         $query = DB::table('contents')
-                   ->select('contents.*', 'modules.name AS module_name')
+                   ->select('contents.*', 'modules.name AS module_name', 'modules.id AS module_id')
                    ->where('contents.status', '<>', self::STATUS_DELETED)
                    ->where('contents.language', LaravelLocalization::getCurrentLocale())
                    ->join('modules', 'modules.handler', '=', 'contents.module_handler')
diff --git a/app/Providers/GlobalViewDataProvider.php b/app/Providers/GlobalViewDataProvider.php
index 957f06d8..c0c92845 100644
--- a/app/Providers/GlobalViewDataProvider.php
+++ b/app/Providers/GlobalViewDataProvider.php
@@ -80,7 +80,14 @@ class GlobalViewDataProvider extends ServiceProvider
 
             return preg_replace($pattern, $code, $view);
         });
-        
+
+        Blade::extend(function ($view) {
+            $pattern = $this->createPattern('date');
+            $code = '<?php echo \App\Helpers\Template::date($2); ?>';
+
+            return preg_replace($pattern, $code, $view);
+        });
+
         // register extension for rendering widget areas
         Blade::extend(function ($view) {
             $pattern = $this->createPattern('widgetArea');
diff --git a/config/app.php b/config/app.php
index 443ea671..dd7ce301 100644
--- a/config/app.php
+++ b/config/app.php
@@ -85,19 +85,23 @@ return [
     |
     */
 
-    'key'            => env('APP_KEY'),
-    'cipher'         => 'AES-256-CBC',
+    'key'                => env('APP_KEY'),
+    'cipher'             => 'AES-256-CBC',
     /*
      * Upload path used for storing all uploaded files
      */
-    'upload_path'    => env('UPLOAD_PATH', public_path('uploads')),
-    'thumbnail_path' => env('THUMBNAIL_PATH', public_path('uploads/thumbnails')),
+    'upload_path'        => env('UPLOAD_PATH', public_path('uploads')),
+    'thumbnail_path'     => env('THUMBNAIL_PATH', public_path('uploads/thumbnails')),
     /*
      * Artisan cannot access to website URL, therefore we need to use PHP_SAPI const for determining running from CLI.
      */
-    'upload_url'     => env('UPLOAD_URL', PHP_SAPI === 'cli' ? '' : url('uploads')),
-    'thumbnail_url'  => env('THUMBNAIL_URL', PHP_SAPI === 'cli' ? '' : url('uploads/thumbnails')),
-    'theme'          => env('THEME'),
+    'upload_url'         => env('UPLOAD_URL', PHP_SAPI === 'cli' ? '' : url('uploads')),
+    'thumbnail_url'      => env('THUMBNAIL_URL', PHP_SAPI === 'cli' ? '' : url('uploads/thumbnails')),
+    'theme'              => env('THEME'),
+    'datetime_format'    => 'd. m. Y G:i',
+    'date_format'        => 'd. m. Y',
+    'datetime_format_js' => 'dd-mm-yyyy hh:ii',
+    'date_format_js'     => 'dd-mm-yyyy',
     /*
     |--------------------------------------------------------------------------
     | Logging Configuration
@@ -125,49 +129,49 @@ return [
 
     'providers' => [
 
-        /*
-         * Laravel Framework Service Providers...
-         */
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Translation\TranslationServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-        Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class,
-        // this class must be before ModulesServiceProvider from PingPong, because it handles files module.json
-        App\Providers\ModuleManager::class,
-        Pingpong\Modules\ModulesServiceProvider::class,
-        Pingpong\Menus\MenusServiceProvider::class,
-        App\Providers\SubmodulesManager::class,
+    /*
+     * Laravel Framework Service Providers...
+     */
+    Illuminate\Auth\AuthServiceProvider::class,
+    Illuminate\Broadcasting\BroadcastServiceProvider::class,
+    Illuminate\Bus\BusServiceProvider::class,
+    Illuminate\Cache\CacheServiceProvider::class,
+    Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
+    Illuminate\Cookie\CookieServiceProvider::class,
+    Illuminate\Database\DatabaseServiceProvider::class,
+    Illuminate\Encryption\EncryptionServiceProvider::class,
+    Illuminate\Filesystem\FilesystemServiceProvider::class,
+    Illuminate\Foundation\Providers\FoundationServiceProvider::class,
+    Illuminate\Hashing\HashServiceProvider::class,
+    Illuminate\Mail\MailServiceProvider::class,
+    Illuminate\Pagination\PaginationServiceProvider::class,
+    Illuminate\Pipeline\PipelineServiceProvider::class,
+    Illuminate\Queue\QueueServiceProvider::class,
+    Illuminate\Redis\RedisServiceProvider::class,
+    Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
+    Illuminate\Session\SessionServiceProvider::class,
+    Illuminate\Translation\TranslationServiceProvider::class,
+    Illuminate\Validation\ValidationServiceProvider::class,
+    Illuminate\View\ViewServiceProvider::class,
+    Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class,
+    // this class must be before ModulesServiceProvider from PingPong, because it handles files module.json
+    App\Providers\ModuleManager::class,
+    Pingpong\Modules\ModulesServiceProvider::class,
+    Pingpong\Menus\MenusServiceProvider::class,
+    App\Providers\SubmodulesManager::class,
 
-        Franzose\ClosureTable\ClosureTableServiceProvider::class,
-        \Watson\Sitemap\SitemapServiceProvider::class,
-        /*
-         * Application Service Providers...
-         */
-        App\Providers\AppServiceProvider::class,
-        App\Providers\AuthServiceProvider::class,
-        App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
-        App\Providers\GlobalViewDataProvider::class,
+    Franzose\ClosureTable\ClosureTableServiceProvider::class,
+    \Watson\Sitemap\SitemapServiceProvider::class,
+    /*
+     * Application Service Providers...
+     */
+    App\Providers\AppServiceProvider::class,
+    App\Providers\AuthServiceProvider::class,
+    App\Providers\EventServiceProvider::class,
+    App\Providers\RouteServiceProvider::class,
+    App\Providers\GlobalViewDataProvider::class,
 
-    ],
+],
     /*
     |--------------------------------------------------------------------------
     | Class Aliases
@@ -181,41 +185,41 @@ return [
 
     'aliases' => [
 
-        'App'                 => Illuminate\Support\Facades\App::class,
-        'Artisan'             => Illuminate\Support\Facades\Artisan::class,
-        'Auth'                => Illuminate\Support\Facades\Auth::class,
-        'Blade'               => Illuminate\Support\Facades\Blade::class,
-        'Cache'               => Illuminate\Support\Facades\Cache::class,
-        'Config'              => Illuminate\Support\Facades\Config::class,
-        'Cookie'              => Illuminate\Support\Facades\Cookie::class,
-        'Crypt'               => Illuminate\Support\Facades\Crypt::class,
-        'DB'                  => Illuminate\Support\Facades\DB::class,
-        'Eloquent'            => Illuminate\Database\Eloquent\Model::class,
-        'Event'               => Illuminate\Support\Facades\Event::class,
-        'File'                => Illuminate\Support\Facades\File::class,
-        'Gate'                => Illuminate\Support\Facades\Gate::class,
-        'Hash'                => Illuminate\Support\Facades\Hash::class,
-        'Lang'                => Illuminate\Support\Facades\Lang::class,
-        'Log'                 => Illuminate\Support\Facades\Log::class,
-        'Mail'                => Illuminate\Support\Facades\Mail::class,
-        'Menu'                => Pingpong\Menus\MenuFacade::class,
-        'Module'              => Pingpong\Modules\Facades\Module::class,
-        'Password'            => Illuminate\Support\Facades\Password::class,
-        'Queue'               => Illuminate\Support\Facades\Queue::class,
-        'Redirect'            => Illuminate\Support\Facades\Redirect::class,
-        'Redis'               => Illuminate\Support\Facades\Redis::class,
-        'Request'             => Illuminate\Support\Facades\Request::class,
-        'Response'            => Illuminate\Support\Facades\Response::class,
-        'Route'               => Illuminate\Support\Facades\Route::class,
-        'Schema'              => Illuminate\Support\Facades\Schema::class,
-        'Session'             => Illuminate\Support\Facades\Session::class,
-        'Sitemap'             => Watson\Sitemap\Facades\Sitemap::class,
-        'Storage'             => Illuminate\Support\Facades\Storage::class,
-        'URL'                 => Illuminate\Support\Facades\URL::class,
-        'Validator'           => Illuminate\Support\Facades\Validator::class,
-        'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class,
-        'View'                => Illuminate\Support\Facades\View::class,
+    'App'                 => Illuminate\Support\Facades\App::class,
+    'Artisan'             => Illuminate\Support\Facades\Artisan::class,
+    'Auth'                => Illuminate\Support\Facades\Auth::class,
+    'Blade'               => Illuminate\Support\Facades\Blade::class,
+    'Cache'               => Illuminate\Support\Facades\Cache::class,
+    'Config'              => Illuminate\Support\Facades\Config::class,
+    'Cookie'              => Illuminate\Support\Facades\Cookie::class,
+    'Crypt'               => Illuminate\Support\Facades\Crypt::class,
+    'DB'                  => Illuminate\Support\Facades\DB::class,
+    'Eloquent'            => Illuminate\Database\Eloquent\Model::class,
+    'Event'               => Illuminate\Support\Facades\Event::class,
+    'File'                => Illuminate\Support\Facades\File::class,
+    'Gate'                => Illuminate\Support\Facades\Gate::class,
+    'Hash'                => Illuminate\Support\Facades\Hash::class,
+    'Lang'                => Illuminate\Support\Facades\Lang::class,
+    'Log'                 => Illuminate\Support\Facades\Log::class,
+    'Mail'                => Illuminate\Support\Facades\Mail::class,
+    'Menu'                => Pingpong\Menus\MenuFacade::class,
+    'Module'              => Pingpong\Modules\Facades\Module::class,
+    'Password'            => Illuminate\Support\Facades\Password::class,
+    'Queue'               => Illuminate\Support\Facades\Queue::class,
+    'Redirect'            => Illuminate\Support\Facades\Redirect::class,
+    'Redis'               => Illuminate\Support\Facades\Redis::class,
+    'Request'             => Illuminate\Support\Facades\Request::class,
+    'Response'            => Illuminate\Support\Facades\Response::class,
+    'Route'               => Illuminate\Support\Facades\Route::class,
+    'Schema'              => Illuminate\Support\Facades\Schema::class,
+    'Session'             => Illuminate\Support\Facades\Session::class,
+    'Sitemap'             => Watson\Sitemap\Facades\Sitemap::class,
+    'Storage'             => Illuminate\Support\Facades\Storage::class,
+    'URL'                 => Illuminate\Support\Facades\URL::class,
+    'Validator'           => Illuminate\Support\Facades\Validator::class,
+    'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class,
+    'View'                => Illuminate\Support\Facades\View::class,
 
-    ],
+],
 
 ];
diff --git a/resources/assets/admin/css/vendor.css b/resources/assets/admin/css/vendor.css
index ac0fd097..e3ed6ccf 100644
--- a/resources/assets/admin/css/vendor.css
+++ b/resources/assets/admin/css/vendor.css
@@ -13028,6 +13028,11 @@ a:focus {
 .form-control {
 	margin: .3em 0;
 }
+
+.text-center {
+	text-align: center;
+}
+
 .has-error {
 	color: #FF4444;
 	font-size: 13px;
@@ -13037,4 +13042,32 @@ a:focus {
 .tab-with-error {
 	color: red !important;
 	font-weight: bold;
+}
+
+.item-col-header {
+	outline: solid 1px;
+}
+
+.full-width {
+	width: 100%;
+}
+
+.content-overview.item-list {
+	display: table;
+}
+
+.table.content-overview td{
+	vertical-align: middle !important;
+}
+
+.content-overview .with-placeholder {
+	max-width: 3em;
+}
+
+.content-overview .placeholder {
+	max-height: 3em;
+}
+
+.item-list .item-actions-dropdown.active .item-actions-block {
+	max-width: 300px !important;
 }
\ No newline at end of file
diff --git a/resources/assets/admin/img/placeholder.png b/resources/assets/admin/img/placeholder.png
new file mode 100644
index 00000000..1cf52229
Binary files /dev/null and b/resources/assets/admin/img/placeholder.png differ
diff --git a/resources/lang/en/admin/contents.php b/resources/lang/en/admin/contents.php
index 51dc80c3..c7c069d1 100644
--- a/resources/lang/en/admin/contents.php
+++ b/resources/lang/en/admin/contents.php
@@ -47,5 +47,10 @@ return [
     'files'                  => 'Files',
     'lockUrl'                => 'Keep URL',
     'noCategory'             => ' -- No category -- ',
-    'noTemplates'            => 'Cannot create content page. There are no available templates for this module.'
+    'noTemplates'            => 'Cannot create content page. There are no available templates for this module.',
+    'title' => 'Title',
+    'createdAt' => 'Created at',
+    'status' => 'Status',
+    'moduleName' => 'Module',
+    'actions' => 'Actions'
 ];
\ No newline at end of file
diff --git a/resources/views/admin/content/overview.blade.php b/resources/views/admin/content/overview.blade.php
index 266571c1..c1086b0e 100644
--- a/resources/views/admin/content/overview.blade.php
+++ b/resources/views/admin/content/overview.blade.php
@@ -1,6 +1,14 @@
 @extends('admin.layoutWithNavigation')
 
 @section('pageHeading', @trans('admin/contents.overview'))
+@section('headerButtons')
+
+    @if($module)
+    <a href="{{route('content.new', ['moduleId' => $module->id])}}" class="btn btn-primary btn-sm rounded-s">
+        <i class="fa fa-plus"></i>
+    </a>
+    @endif
+@endsection
 
 @section('content')
     @if (!$homepage)
@@ -14,20 +22,130 @@
     @endif
 
 
+
     @if (count($pages))
-        <table>
+        <table class="table item-list full-width content-overview table-striped table-bordered table-hover">
             <tr>
                 <th></th>
-                <th></th>
-                <th></th>
-                <th></th>
+                <th>@lang('admin/contents.title')</th>
+                <th>@lang('admin/contents.status')</th>
+                <th>@lang('admin/contents.moduleName')</th>
+                <th>@lang('admin/contents.createdAt')</th>
+                <th>@lang('admin/contents.actions')</th>
             </tr>
             @foreach($pages as $page)
                 <tr>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
+                    <td class="text-center with-placeholder">
+                        <a href="{{route('content.edit', ['id' => $page->id])}}">
+                            @if(!empty($page->title_photo))
+                                <img src="@upload($page->title_photo)" class="placeholder" alt="{{$page->title}}" />
+                            @else
+                                <img src="{{asset('resources/assets/admin/img/placeholder.png')}}" class="placeholder"
+                                     alt="{{$page->title}}" />
+                            @endif
+                        </a>
+                    </td>
+                    <td>
+                        <a href="{{route('content.edit', ['id' => $page->id])}}">
+                            {{$page->title}}
+                        </a>
+                    </td>
+                    <td>{{$statuses[$page->status]}}</td>
+                    <td>
+                        <a href="{{route('content.overview', ['moduleId' => $page->module_id])}}">
+                            {{trans($page->module_name)}}
+                        </a>
+                    </td>
+                    <td>@date($page->created_at)</td>
+                    <td class="text-center">
+                        <div class="item-actions-dropdown">
+                            <a class="item-actions-toggle-btn">
+                                <span class="inactive">
+                                <i class="fa fa-cog"></i>
+                                </span>
+                                <span class="active">
+                                <i class="fa fa-chevron-circle-right"></i>
+                                </span>
+                            </a>
+                            <div class="item-actions-block">
+                                <ul class="item-actions-list">
+
+                                    @if(!$page->is_homepage)
+
+                                        <li>
+
+                                            <a href="{{route('content.setHomepage', ['id' => $page->id])}}"
+                                               class="button tiny success">
+                                                <i class="fa fa-home"></i>
+                                                {{--@lang('admin/contents.setHomepage')--}}
+                                            </a>
+                                        </li>
+
+
+                                    @endif
+
+                                    <li>
+                                        <a class="edit" href="{{route('content.edit', ['id' => $page->id])}}"
+                                           class="button tiny success">
+                                            <i class="fa fa-pencil"></i>
+                                            {{--                                        @lang('admin/contents.editPlain')--}}
+                                        </a>
+                                    </li>
+
+                                    @if($page->status == \App\Models\Content::STATUS_DRAFT)
+                                        <li>
+                                            <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
+                                               class="button tiny success">
+                                                <i class="fa fa-eye"></i>
+                                                {{--                                            @lang('admin/contents.makePublic')--}}
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
+                                               class="button tiny warning" data-toggle="modal"
+                                               data-target="#confirm-modal">
+                                                <i class="fa fa-lock"></i>
+                                                {{--                                            @lang('admin/contents.makeProtected')--}}
+                                            </a>
+                                        </li>
+                                    @else
+                                        <li>
+                                            <a href="{{route('page.content', ['url' => $page->url])}}" target="_blank"
+                                               class="button tiny secondary"><i class="fa fa-desktop"></i>
+                                                {{--@lang('admin/contents.viewPage')--}}
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
+                                               class="button tiny warning confirm"><i
+                                                        class="fa fa-eye-slash"></i>
+                                                {{--@lang('admin/contents.makeDraft')--}}
+                                            </a>
+                                        </li>
+                                    @endif
+
+                                    <li>
+                                        <a class="remove" data-toggle="modal" data-target="#confirm-modal"
+                                           href="{{route('content.delete', ['id' => $page->id])}}"
+                                           class="button tiny alert confirm"><i
+                                                    class="fa fa-trash-o"></i>
+                                            {{--@lang('admin/contents.deletePage')--}}
+                                        </a>
+                                    </li>
+
+
+                                    {{--<li>--}}
+                                    {{--<a class="remove" href="#" data-toggle="modal" data-target="#confirm-modal"> <i--}}
+                                    {{--class="fa fa-trash-o "></i> </a>--}}
+                                    {{--</li>--}}
+                                    {{--<li>--}}
+                                    {{--<a class="edit" href="item-editor.html"> <i class="fa fa-pencil"></i> </a>--}}
+                                    {{--</li>--}}
+                                </ul>
+                            </div>
+                        </div>
+
+                    </td>
                 </tr>
             @endforeach
         </table>
@@ -41,4 +159,22 @@
             @lang('admin/contents.noPagesAvailable')
         </div>
     @endif
-@endsection
\ No newline at end of file
+@endsection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php
index 3f89e985..b9cb30fe 100644
--- a/resources/views/admin/layout.blade.php
+++ b/resources/views/admin/layout.blade.php
@@ -42,6 +42,24 @@
 
 @yield('page')
 
+<!-- /.modal -->
+<div class="modal fade" id="confirm-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title"><i class="fa fa-warning"></i> Alert</h4> </div>
+            <div class="modal-body">
+                <p>Are you sure want to do this?</p>
+            </div>
+            <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">Yes</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">No</button> </div>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+
 <div class="ref" id="ref">
     <div class="color-primary"></div>
     <div class="chart">
diff --git a/resources/views/admin/layoutWithNavigation.blade.php b/resources/views/admin/layoutWithNavigation.blade.php
index 799da4b9..ebf5e125 100644
--- a/resources/views/admin/layoutWithNavigation.blade.php
+++ b/resources/views/admin/layoutWithNavigation.blade.php
@@ -146,7 +146,7 @@
             <article class="content charts-flot-page">
                 <div class="title-block">
                     <h3 class="title">
-                        @yield('pageHeading')
+                        @yield('pageHeading') @yield('headerButtons')
                     </h3>
                     <p class="title-description">@yield('pageDescription')</p>
                 </div>