diff --git a/app/Handlers/Search/Presenters/AdminContent.php b/app/Handlers/Search/Presenters/AdminContent.php
index 3ec76829..4134fc03 100644
--- a/app/Handlers/Search/Presenters/AdminContent.php
+++ b/app/Handlers/Search/Presenters/AdminContent.php
@@ -1,12 +1,16 @@
 <?php
 namespace App\Handlers\Search\Presenters;
 
+use App\Enumerations\ContentStatuses;
 use App\Handlers\Contracts\SearchPresenterHandler;
 
 class AdminContent implements SearchPresenterHandler
 {
     public function render($foundItems)
     {
-        return view('admin.content.overviewTiles', ['pages' => $foundItems, 'tileClass' => 'large-4']);
+        return view('admin.search.results.content', [
+            'pages'    => $foundItems,
+            'statuses' => ContentStatuses::getWithTranslations(),
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/Handlers/Search/Presenters/AdminFiles.php b/app/Handlers/Search/Presenters/AdminFiles.php
index 7ce21748..0035eef1 100644
--- a/app/Handlers/Search/Presenters/AdminFiles.php
+++ b/app/Handlers/Search/Presenters/AdminFiles.php
@@ -14,6 +14,6 @@ class AdminFiles implements SearchPresenterHandler
      */
     public function render($foundItems)
     {
-        return view('admin.fileManager.filesTiles', ['files' => $foundItems]);
+        return view('admin.fileManager.filesTiles', ['files' => $foundItems, 'hideDelete' => true]);
     }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/Search.php b/app/Http/Controllers/Admin/Search.php
index 45c5eaf8..e23d9ab7 100644
--- a/app/Http/Controllers/Admin/Search.php
+++ b/app/Http/Controllers/Admin/Search.php
@@ -57,7 +57,6 @@ class Search extends Controller
              * @var SearchHandler          $search
              * @var SearchPresenterHandler $presenter
              */
-
             list ($search, $presenter) = $engine;
 
             // try to find given term
diff --git a/resources/views/admin/fileManager/filesTiles.blade.php b/resources/views/admin/fileManager/filesTiles.blade.php
index 4f905ceb..7baa27bd 100644
--- a/resources/views/admin/fileManager/filesTiles.blade.php
+++ b/resources/views/admin/fileManager/filesTiles.blade.php
@@ -11,10 +11,12 @@
                 {{str_limit($file->original_filename, 10)}}
             </a>
 
-            <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-sm btn-danger"
-               title="@lang('admin/fileManager.delete')">
-                <i class="fa fa-remove"></i>
-            </a>
+            @if(!isset($hideDelete) || !$hideDelete)
+                <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-sm btn-danger"
+                   title="@lang('admin/fileManager.delete')">
+                    <i class="fa fa-remove"></i>
+                </a>
+            @endif
         </div>
     @empty
         <div class="alert alert-info">
diff --git a/resources/views/admin/search/form.blade.php b/resources/views/admin/search/form.blade.php
new file mode 100644
index 00000000..ec34e223
--- /dev/null
+++ b/resources/views/admin/search/form.blade.php
@@ -0,0 +1,14 @@
+<form action="{{route('search')}}" method="get">
+
+    <div class="col-sm-11">
+        <input type="text" class="form-control" value="@if(isset($search)){{$search}}@endif"
+               placeholder="@lang('search.term')" name="search" />
+    </div>
+    <div class="col-sm-1">
+        <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+
+    </div>
+
+
+
+</form>
\ No newline at end of file
diff --git a/resources/views/admin/search/page.blade.php b/resources/views/admin/search/page.blade.php
new file mode 100644
index 00000000..0c3597bd
--- /dev/null
+++ b/resources/views/admin/search/page.blade.php
@@ -0,0 +1,22 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('search.pageTitle'))
+
+@section('content')
+    @if ($search)
+        <div class="row">
+            <div class="col-lg-8">
+                <h3>@lang('search.results')</h3>
+                @include('admin.search.results')
+            </div>
+            <div class="col-lg-4">
+                <h3>@lang('search.term')</h3>
+                @include('admin.search.form')
+            </div>
+        </div>
+    @else
+        <div class="row">
+            @include('admin.search.form')
+        </div>
+    @endif
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/search/results.blade.php b/resources/views/admin/search/results.blade.php
new file mode 100644
index 00000000..e35035cc
--- /dev/null
+++ b/resources/views/admin/search/results.blade.php
@@ -0,0 +1,7 @@
+
+@foreach($results as $id => $result)
+    {{--<div class="search-result" id="{{$id}}">--}}
+        <h4>{{$result['name']}} ({{$result['count']}})</h4>
+        {!! $result['content'] !!}
+    {{--</div>--}}
+@endforeach
\ No newline at end of file
diff --git a/resources/views/admin/search/results/content.blade.php b/resources/views/admin/search/results/content.blade.php
new file mode 100644
index 00000000..e9dcaa4f
--- /dev/null
+++ b/resources/views/admin/search/results/content.blade.php
@@ -0,0 +1,37 @@
+<div class="search-result">
+    @if (count($pages))
+        <table class="table item-list full-width content-overview table-striped table-bordered table-hover">
+            <tr>
+                <th></th>
+                <th>@lang('admin/contents.title')</th>
+                <th>@lang('admin/contents.status')</th>
+                <th>@lang('admin/contents.createdAt')</th>
+            </tr>
+            @foreach($pages as $page)
+                <tr>
+                    <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>@date($page->created_at)</td>
+                </tr>
+            @endforeach
+        </table>
+    @else
+        <div class="alert alert-info">
+            @lang('admin/contents.noPagesAvailable')
+        </div>
+    @endif
+</div>
\ No newline at end of file