diff --git a/composer.json b/composer.json
index ea6d98fb..26c0ae45 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,8 @@
         }
     ],
     "require": {
-        "luketowers/purifier": "~3.0"
+        "mews/purifier": "^3.3",
+        "laravel/scout": "^7.1"
     },
     "require-dev": {
         "illuminate/cache": "~5.1.20|5.2.*|5.3.*",
diff --git a/config/chatter.php b/config/chatter.php
index 0867abec..6a030701 100644
--- a/config/chatter.php
+++ b/config/chatter.php
@@ -30,11 +30,12 @@
     | description from the language files will be used.
     |
     |   *headline_logo*: If this is set an image will be used on the forum home
-    |       instead of text. Specify the relative path to the image here.
+    |       instead of text. Specify the relative path to the image here. If the
+    |       value is false, nothing will be displayed.
     |
     */
 
-    'headline_logo' => '/vendor/devdojo/chatter/assets/images/logo-light.png',
+    'headline_logo' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -190,6 +191,22 @@
         'plugins' => 'link, image',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Response Settings
+    |--------------------------------------------------------------------------
+    |
+    | Whether chatter should strip all styles attributes and remove tags
+    | from new responses.
+    |
+    */
+
+    'response' => [
+        'strip_styles' => true,
+        'strip_tags' => true,
+        'allowed_tags' => '<a><ul><ol><li><strong><b><i><u><p><br>',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Default orderby
@@ -253,7 +270,7 @@
     'paginate' => [
         'num_of_results' => 10,
     ],
-    
+
     /*
     |--------------------------------------------------------------------------
     | Show missing fields to users in forms
diff --git a/database/migrations/2016_07_29_171118_create_chatter_discussion_table.php b/database/migrations/2016_07_29_171118_create_chatter_discussion_table.php
index d6415300..89e11595 100755
--- a/database/migrations/2016_07_29_171118_create_chatter_discussion_table.php
+++ b/database/migrations/2016_07_29_171118_create_chatter_discussion_table.php
@@ -11,7 +11,7 @@ public function up()
             $table->increments('id');
             $table->integer('chatter_category_id')->unsigned()->default('1');
             $table->string('title');
-            $table->integer('user_id')->unsigned();
+            $table->bigInteger('user_id')->unsigned();
             $table->boolean('sticky')->default(false);
             $table->integer('views')->unsigned()->default('0');
             $table->boolean('answered')->default(0);
diff --git a/database/migrations/2016_07_29_171118_create_chatter_post_table.php b/database/migrations/2016_07_29_171118_create_chatter_post_table.php
index cb943d04..73ae9595 100755
--- a/database/migrations/2016_07_29_171118_create_chatter_post_table.php
+++ b/database/migrations/2016_07_29_171118_create_chatter_post_table.php
@@ -10,7 +10,7 @@ public function up()
         Schema::create('chatter_post', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('chatter_discussion_id')->unsigned();
-            $table->integer('user_id')->unsigned();
+            $table->bigInteger('user_id')->unsigned();
             $table->text('body');
             $table->timestamps();
         });
diff --git a/database/migrations/2017_01_16_121747_create_chatter_user_discussion_pivot_table.php b/database/migrations/2017_01_16_121747_create_chatter_user_discussion_pivot_table.php
index e8a4f553..18dc462b 100644
--- a/database/migrations/2017_01_16_121747_create_chatter_user_discussion_pivot_table.php
+++ b/database/migrations/2017_01_16_121747_create_chatter_user_discussion_pivot_table.php
@@ -13,7 +13,7 @@ class CreateChatterUserDiscussionPivotTable extends Migration
     public function up()
     {
         Schema::create('chatter_user_discussion', function (Blueprint $table) {
-            $table->integer('user_id')->unsigned()->index();
+            $table->bigInteger('user_id')->unsigned()->index();
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->integer('discussion_id')->unsigned()->index();
             $table->foreign('discussion_id')->references('id')->on('chatter_discussion')->onDelete('cascade');
diff --git a/public/assets/js/tinymce.js b/public/assets/js/tinymce.js
index d18082f4..5aa4a78f 100644
--- a/public/assets/js/tinymce.js
+++ b/public/assets/js/tinymce.js
@@ -3,23 +3,23 @@ var chatter_tinymce_plugins = $('#chatter_tinymce_plugins').val();
 
 // Initiate the tinymce editor on any textarea with a class of richText
 tinymce.init({
-	selector:'textarea.richText',
-	skin: 'chatter',
-	plugins: chatter_tinymce_plugins,
-	toolbar: chatter_tinymce_toolbar,
-	menubar: false,
-	statusbar: false,
-	height : '220',
-	content_css : '/vendor/devdojo/chatter/assets/css/chatter.css',
-	template_popup_height: 380,
-	setup: function (editor) {
+    selector:'textarea.richText',
+    skin: 'chatter',
+    plugins: chatter_tinymce_plugins,
+    toolbar: chatter_tinymce_toolbar,
+    menubar: false,
+    statusbar: false,
+    height : '220',
+    content_css : document.querySelector('[href$="chatter.css"]').href,
+    template_popup_height: 380,
+    setup: function (editor) {
         editor.on('init', function(args) {
-        	// The tinymce editor is ready
+            // The tinymce editor is ready
             document.getElementById('new_discussion_loader').style.display = "none";
             if(!editor.getContent()){
                 document.getElementById('tinymce_placeholder').style.display = "block";
             }
-			document.getElementById('chatter_form_editor').style.display = "block";
+            document.getElementById('chatter_form_editor').style.display = "block";
 
             // check if user is in discussion view
             if ($('#new_discussion_loader_in_discussion_view').length > 0) {
@@ -28,14 +28,14 @@ tinymce.init({
             }
         });
         editor.on('keyup', function(e) {
-        	content = editor.getContent();
-        	if(content){
-        		//$('#tinymce_placeholder').fadeOut();
-        		document.getElementById('tinymce_placeholder').style.display = "none";
-        	} else {
-        		//$('#tinymce_placeholder').fadeIn();
-        		document.getElementById('tinymce_placeholder').style.display = "block";
-        	}
+            content = editor.getContent();
+            if(content){
+                //$('#tinymce_placeholder').fadeOut();
+                document.getElementById('tinymce_placeholder').style.display = "none";
+            } else {
+                //$('#tinymce_placeholder').fadeIn();
+                document.getElementById('tinymce_placeholder').style.display = "block";
+            }
         });
     }
 });
@@ -49,7 +49,7 @@ function initializeNewTinyMCE(id){
         menubar: false,
         statusbar: false,
         height : '300',
-        content_css : '/vendor/devdojo/chatter/assets/css/chatter.css',
+        content_css : document.querySelector('[href$="chatter.css"]').href,
         template_popup_height: 380
     });
 }
diff --git a/src/ChatterServiceProvider.php b/src/ChatterServiceProvider.php
index e6394ac4..c21c2b93 100644
--- a/src/ChatterServiceProvider.php
+++ b/src/ChatterServiceProvider.php
@@ -3,6 +3,7 @@
 namespace DevDojo\Chatter;
 
 use Illuminate\Support\ServiceProvider;
+use DevDojo\Chatter\Models\Models;
 
 class ChatterServiceProvider extends ServiceProvider
 {
@@ -36,6 +37,10 @@ public function boot()
 
         // include the routes file
         include __DIR__.'/Routes/web.php';
+
+        view()->composer(['chatter::blocks.sidebar', 'chatter::discussion', 'chatter::home'], function($view) {
+            $view->with('categories', Models::category()->orderBy('order')->get());
+        });
     }
 
     /**
@@ -48,13 +53,13 @@ public function register()
         /*
          * Register the service provider for the dependency.
          */
-        $this->app->register(\LukeTowers\Purifier\PurifierServiceProvider::class);
+        $this->app->register(\Mews\Purifier\PurifierServiceProvider::class);
 
         /*
          * Create aliases for the dependency.
          */
         $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-        $loader->alias('Purifier', 'LukeTowers\Purifier\Facades\Purifier');
+        $loader->alias('Purifier', 'Mews\Purifier\Facades\Purifier');
 
         $this->loadViewsFrom(__DIR__.'/Views', 'chatter');
     }
diff --git a/src/Controllers/ChatterController.php b/src/Controllers/ChatterController.php
index 36a1d7b9..4bc370e3 100644
--- a/src/Controllers/ChatterController.php
+++ b/src/Controllers/ChatterController.php
@@ -12,11 +12,11 @@ class ChatterController extends Controller
     public function index($slug = '')
     {
         $pagination_results = config('chatter.paginate.num_of_results');
-        
-        $discussions = Models::discussion()->with('user')->with('post')->with('postsCount')->with('category')->orderBy(config('chatter.order_by.discussions.order'), config('chatter.order_by.discussions.by'));
+
+        $discussions = Models::discussion()->with('user')->with('post')->with('category')->orderBy(config('chatter.order_by.discussions.order'), config('chatter.order_by.discussions.by'));
         if (isset($slug)) {
             $category = Models::category()->where('slug', '=', $slug)->first();
-            
+
             if (isset($category->id)) {
                 $current_category_id = $category->id;
                 $discussions = $discussions->where('chatter_category_id', '=', $category->id);
@@ -24,31 +24,31 @@ public function index($slug = '')
                 $current_category_id = null;
             }
         }
-        
+
         $discussions = $discussions->paginate($pagination_results);
-        
-        $categories = Models::category()->get();
+
+        $categories = Models::category()->orderBy('order')->get();
         $categoriesMenu = Helper::categoriesMenu(array_filter($categories->toArray(), function ($item) {
             return $item['parent_id'] === null;
         }));
-        
+
         $chatter_editor = config('chatter.editor');
-        
+
         if ($chatter_editor == 'simplemde') {
             // Dynamically register markdown service provider
             \App::register('GrahamCampbell\Markdown\MarkdownServiceProvider');
         }
-        
-        return view('chatter::home', compact('discussions', 'categories', 'categoriesMenu', 'chatter_editor', 'current_category_id'));
+
+        return view('chatter::home', compact('discussions', 'categoriesMenu', 'chatter_editor', 'current_category_id'));
     }
-    
+
     public function login()
     {
         if (!Auth::check()) {
             return \Redirect::to('/'.config('chatter.routes.login').'?redirect='.config('chatter.routes.home'))->with('flash_message', 'Please create an account before posting.');
         }
     }
-    
+
     public function register()
     {
         if (!Auth::check()) {
diff --git a/src/Controllers/ChatterDiscussionController.php b/src/Controllers/ChatterDiscussionController.php
index 4a3be3e3..53cdf4b9 100644
--- a/src/Controllers/ChatterDiscussionController.php
+++ b/src/Controllers/ChatterDiscussionController.php
@@ -29,7 +29,7 @@ public function index(Request $request)
         if ($request->offset) {
             $offset = $request->offset;
         }
-        $discussions = Models::discussion()->with('user')->with('post')->with('postsCount')->with('category')->orderBy('created_at', 'ASC')->take($total)->offset($offset)->get();*/
+        $discussions = Models::discussion()->with('user')->with('post')->with('category')->orderBy('created_at', 'ASC')->take($total)->offset($offset)->get();*/
 
         // Return an empty array to avoid exposing user data to the public.
         // This index function is not being used anywhere.
@@ -75,9 +75,9 @@ public function store(Request $request)
 			'body_content.min' => trans('chatter::alert.danger.reason.content_min'),
 			'chatter_category_id.required' => trans('chatter::alert.danger.reason.category_required'),
 		]);
-        
 
-        Event::fire(new ChatterBeforeNewDiscussion($request, $validator));
+
+        Event::dispatch(new ChatterBeforeNewDiscussion($request, $validator));
         if (function_exists('chatter_before_new_discussion')) {
             chatter_before_new_discussion($request, $validator);
         }
@@ -149,7 +149,7 @@ public function store(Request $request)
         $post = Models::post()->create($new_post);
 
         if ($post->id) {
-            Event::fire(new ChatterAfterNewDiscussion($request, $discussion, $post));
+            Event::dispatch(new ChatterAfterNewDiscussion($request, $discussion, $post));
             if (function_exists('chatter_after_new_discussion')) {
                 chatter_after_new_discussion($request);
             }
@@ -217,7 +217,7 @@ public function show($category, $slug = null)
         }
 
         $discussion->increment('views');
-        
+
         return view('chatter::discussion', compact('discussion', 'posts', 'chatter_editor'));
     }
 
diff --git a/src/Controllers/ChatterPostController.php b/src/Controllers/ChatterPostController.php
index 96aa1ba0..1c468805 100644
--- a/src/Controllers/ChatterPostController.php
+++ b/src/Controllers/ChatterPostController.php
@@ -56,7 +56,7 @@ public function store(Request $request)
 			'body.min' => trans('chatter::alert.danger.reason.content_min'),
 		]);
 
-        Event::fire(new ChatterBeforeNewResponse($request, $validator));
+        Event::dispatch(new ChatterBeforeNewResponse($request, $validator));
         if (function_exists('chatter_before_new_response')) {
             chatter_before_new_response($request, $validator);
         }
@@ -65,6 +65,20 @@ public function store(Request $request)
             return back()->withErrors($validator)->withInput();
         }
 
+        $cleaned_response = $request->input('body');
+
+        if (config('chatter.response.strip_tags')) {
+            $allowed_tags = config('chagger.response.allowed_tags') ?: null;
+            $cleaned_response = strip_tags($cleaned_response, $allowed_tags);
+        }
+
+        if (config('chatter.response.strip_styles')) {
+            $cleaned_response = preg_replace('/(<[^>]+) class=".*?"/i', '$1', $cleaned_response); //  remove classes
+            $cleaned_response = preg_replace('/(<[^>]+) style=".*?"/i', '$1', $cleaned_response); //  remove styles
+        }
+
+        $request->merge(['body' => $cleaned_response]);
+
         if (config('chatter.security.limit_time_between_posts')) {
             if ($this->notEnoughTimeBetweenPosts()) {
                 $minutes = trans_choice('chatter::messages.words.minutes', config('chatter.security.time_between_posts'));
@@ -97,8 +111,8 @@ public function store(Request $request)
         if ($new_post->id) {
             $discussion->last_reply_at = $discussion->freshTimestamp();
             $discussion->save();
-            
-            Event::fire(new ChatterAfterNewResponse($request, $new_post));
+
+            Event::dispatch(new ChatterAfterNewResponse($request, $new_post));
             if (function_exists('chatter_after_new_response')) {
                 chatter_after_new_response($request);
             }
@@ -148,6 +162,17 @@ private function sendEmailNotifications($discussion)
         }
     }
 
+    public function show($id)
+    {
+        $post = Models::post()->with('discussion')->findOrFail($id);
+
+        if ($post) {
+            return redirect(null, 301)->route('chatter.discussion.showInCategory', [$post->discussion->category->slug, $post->discussion->slug]);
+        }
+
+        abort(404);
+    }
+
     /**
      * Update the specified resource in storage.
      *
diff --git a/src/Controllers/ChatterSearchController.php b/src/Controllers/ChatterSearchController.php
new file mode 100644
index 00000000..9e0526c7
--- /dev/null
+++ b/src/Controllers/ChatterSearchController.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace DevDojo\Chatter\Controllers;
+
+use DevDojo\Chatter\Helpers\ChatterHelper as Helper;
+use DevDojo\Chatter\Models\Models;
+use DevDojo\Chatter\Models\Post;
+use Illuminate\Routing\Controller as Controller;
+
+class ChatterSearchController extends Controller
+{
+    public function index()
+    {
+        $query = request('q');
+        $orderBy = config('chatter.order_by.discussions.order');
+        $orderDirection = config('chatter.order_by.discussions.by');
+        $pagination_results = config('chatter.paginate.num_of_results');
+
+        $posts = Post::search($query)->get()->pluck('chatter_discussion_id')->toArray();
+        $discussionIds = array_values($posts);
+        $discussions = Models::discussion()
+                             ->with('user')
+                             ->with('post')
+                             ->with('category')
+                             ->whereIn('id', $discussionIds)
+                             ->groupBy('id')
+                             ->orderBy($orderBy, $orderDirection)
+                             ->paginate($pagination_results);
+
+        $current_category_id = null;
+
+        $categories = Models::category()->orderBy('order')->get();
+        $categoriesMenu = Helper::categoriesMenu(array_filter($categories->toArray(), function ($item) {
+            return $item['parent_id'] === null;
+        }));
+
+        $chatter_editor = config('chatter.editor');
+
+        if ($chatter_editor == 'simplemde') {
+            // Dynamically register markdown service provider
+            \App::register('GrahamCampbell\Markdown\MarkdownServiceProvider');
+        }
+
+        return view('chatter::home', compact('discussions', 'categoriesMenu', 'chatter_editor', 'current_category_id', 'query'));
+    }
+}
\ No newline at end of file
diff --git a/src/Helpers/ChatterHelper.php b/src/Helpers/ChatterHelper.php
index e8bcc52c..2a721959 100644
--- a/src/Helpers/ChatterHelper.php
+++ b/src/Helpers/ChatterHelper.php
@@ -107,7 +107,7 @@ public static function categoriesMenu($categories)
 
         foreach ($categories as $category) {
             $menu .= '<li>';
-            $menu .= '<a href="/'.config('chatter.routes.home').'/'.config('chatter.routes.category').'/'.$category['slug'].'">';
+            $menu .= '<a href="'.route('chatter.category.show', $category['slug']).'">';
             $menu .= '<div class="chatter-box" style="background-color:'.$category['color'].'"></div>';
             $menu .= $category['name'].'</a>';
 
diff --git a/src/Lang/en/email.php b/src/Lang/en/email.php
index 8a331827..19155638 100644
--- a/src/Lang/en/email.php
+++ b/src/Lang/en/email.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'subject'         => 'Discussion Reply',
     'preheader'       => 'Just wanted to let you know that someone has responded to a forum post.',
     'greeting'        => 'Hi there,',
     'body'            => 'Just wanted to let you know that someone has responded to a forum post at',
diff --git a/src/Lang/en/messages.php b/src/Lang/en/messages.php
index 5baa5d2b..fb9a5824 100644
--- a/src/Lang/en/messages.php
+++ b/src/Lang/en/messages.php
@@ -37,8 +37,8 @@
         'notify' => 'Notify me when someone replies',
     ],
 
-    'auth' => 'Please <a href="/:home/login">login</a>
-                or <a href="/:home/register">register</a>
+    'auth' => 'Please <a href="'.route(config('chatter.routes.login')).'">login</a>
+                or <a href="'.route(config('chatter.routes.register')).'">register</a>
                 to leave a response.',
 
 ];
diff --git a/src/Lang/es/email.php b/src/Lang/es/email.php
index c312a5ca..193e792c 100644
--- a/src/Lang/es/email.php
+++ b/src/Lang/es/email.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'subject'         => 'Responder a la discusión',
     'preheader'       => 'Este texto es como un encabezado. Algunos clientes muestran este texto como una vista previa.',
     'greeting'        => 'Hola,',
     'body'            => 'Te informamos que alguien ha respondido a una '.mb_strtolower(trans('chatter::intro.titles.discussion')).' publicada en',
diff --git a/src/Lang/es/messages.php b/src/Lang/es/messages.php
index 7592c3de..41da4419 100644
--- a/src/Lang/es/messages.php
+++ b/src/Lang/es/messages.php
@@ -37,8 +37,8 @@
         'notify' => 'Notificarme cuando alguien conteste en la '.mb_strtolower(trans('chatter::intro.titles.discussion')),
     ],
 
-    'auth' => 'Por favor <a href="/:home/login">Inicia sesión</a>
-                o <a href="/:home/register">Regístrate</a>
+    'auth' => 'Por favor <a href="'.route(config('chatter.routes.login')).'">Inicia sesión</a>
+                o <a href="'.route(config('chatter.routes.register')).'">Regístrate</a>
                 para dejar una respuesta.',
 
 ];
diff --git a/src/Lang/nl/email.php b/src/Lang/nl/email.php
index c4f7685d..623af970 100644
--- a/src/Lang/nl/email.php
+++ b/src/Lang/nl/email.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'subject'         => 'Discussiereactie',
     'preheader'       => 'We laten je even weten dat iemand gereageerd heeft op een forum discussie.',
     'greeting'        => 'Hallo,',
     'body'            => 'We laten je even weten dat iemand gereageerd heeft op een forum discussie op',
diff --git a/src/Lang/nl/messages.php b/src/Lang/nl/messages.php
index a9c21008..ef2abf68 100644
--- a/src/Lang/nl/messages.php
+++ b/src/Lang/nl/messages.php
@@ -38,8 +38,8 @@
         'notify' => 'Stuur mij notificaties van antwoorden',
     ],
 
-    'auth' => 'Je moet <a href="/:home/login">inloggen</a>
-                of <a href="/:home/register">registreren</a>
+    'auth' => 'Je moet <a href="'.route(config('chatter.routes.login')).'">inloggen</a>
+                of <a href="'.route(config('chatter.routes.register')).'">registreren</a>
                 om een reactie te plaatsen.',
 
 ];
diff --git a/src/Lang/ro/email.php b/src/Lang/ro/email.php
index 5837418e..29036a6f 100644
--- a/src/Lang/ro/email.php
+++ b/src/Lang/ro/email.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'subject'         => 'Răspunsul la discuții',
     'preheader'       => 'Vreau doar să știi că cineva a răspuns unui postări de pe forum.',
     'greeting'        => 'Salutare,',
     'body'            => 'Vreau doar să știi că cineva a răspuns unei postări de pe forum la',
diff --git a/src/Lang/ro/messages.php b/src/Lang/ro/messages.php
index eb340510..6b00cf5f 100644
--- a/src/Lang/ro/messages.php
+++ b/src/Lang/ro/messages.php
@@ -37,8 +37,8 @@
         'notify' => 'Anunță-mă când cineva răspunde',
     ],
 
-    'auth' => 'Te rog <a href="/:home/login">autentifică-te</a>
-                sau <a href="/:home/register">înregistrează-te</a>
+    'auth' => 'Te rog <a href="'.route(config('chatter.routes.login')).'">autentifică-te</a>
+                sau <a href="'.route(config('chatter.routes.register')).'">înregistrează-te</a>
                 pentru a lăsa un răspuns.',
 
 ];
diff --git a/src/Mail/ChatterDiscussionUpdated.php b/src/Mail/ChatterDiscussionUpdated.php
index 4d9c5ab9..1da5cca8 100644
--- a/src/Mail/ChatterDiscussionUpdated.php
+++ b/src/Mail/ChatterDiscussionUpdated.php
@@ -33,6 +33,7 @@ public function build()
         return $this->view(config('chatter.email.view'))
                     ->with([
                         'discussion' => $this->discussion,
-                    ]);
+                    ])
+                    ->subject(trans('chatter::email.subject'));
     }
 }
diff --git a/src/Models/Discussion.php b/src/Models/Discussion.php
index 5abb6df7..a2670f0c 100755
--- a/src/Models/Discussion.php
+++ b/src/Models/Discussion.php
@@ -8,7 +8,7 @@
 class Discussion extends Model
 {
     use SoftDeletes;
-    
+
     protected $table = 'chatter_discussion';
     public $timestamps = true;
     protected $fillable = ['title', 'chatter_category_id', 'user_id', 'slug', 'color'];
@@ -29,20 +29,24 @@ public function posts()
         return $this->hasMany(Models::className(Post::class), 'chatter_discussion_id');
     }
 
+    /**
+     * The main post for this discussion
+     *
+     */
     public function post()
     {
-        return $this->hasMany(Models::className(Post::class), 'chatter_discussion_id')->orderBy('created_at', 'ASC');
+        return $this->hasOne(Models::className(Post::class), 'chatter_discussion_id')->orderBy('created_at', 'asc');
     }
 
-    public function postsCount()
+    public function users()
     {
-        return $this->posts()
-        ->selectRaw('chatter_discussion_id, count(*)-1 as total')
-        ->groupBy('chatter_discussion_id');
+        return $this->belongsToMany(config('chatter.user.namespace'), 'chatter_user_discussion', 'discussion_id', 'user_id');
     }
 
-    public function users()
+    public function getBodyAttribute()
     {
-        return $this->belongsToMany(config('chatter.user.namespace'), 'chatter_user_discussion', 'discussion_id', 'user_id');
+        $post = $this->posts()->orderBy('created_at', 'asc')->first();
+
+        return $post->body;
     }
 }
diff --git a/src/Models/Post.php b/src/Models/Post.php
index 112ca517..e3a5054a 100755
--- a/src/Models/Post.php
+++ b/src/Models/Post.php
@@ -4,11 +4,13 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use GrahamCampbell\Markdown\Facades\Markdown;
+use Laravel\Scout\Searchable;
 
 class Post extends Model
 {
-    use SoftDeletes;
-    
+    use SoftDeletes, Searchable;
+
     protected $table = 'chatter_post';
     public $timestamps = true;
     protected $fillable = ['chatter_discussion_id', 'user_id', 'body', 'markdown'];
@@ -23,4 +25,19 @@ public function user()
     {
         return $this->belongsTo(config('chatter.user.namespace'));
     }
+
+    public function getBodyAttribute($field)
+    {
+        if (isset($this->attributes['markdown']) && $this->attributes['markdown'] == true) {
+            // todo: verify $discussion was intentional or meant to be $this->discussion
+            $field = Markdown::convertToHtml($this->discussion->post[0]->body);
+        }
+
+        return $field;
+    }
+
+    public function toSearchableArray()
+    {
+        return $this->toArray();
+    }
 }
diff --git a/src/Routes/web.php b/src/Routes/web.php
index 87eff492..7a4a22cd 100644
--- a/src/Routes/web.php
+++ b/src/Routes/web.php
@@ -76,6 +76,12 @@
             'middleware' => $middleware('discussion.index'),
         ]);
 
+        // Search discussions view.
+        Route::get('search', [
+            'as'    => 'search',
+            'uses'  => 'ChatterSearchController@index'
+        ]);
+
         // Create discussion view.
         Route::get('create', [
             'as'         => 'create',
diff --git a/src/Views/blocks/avatar.blade.php b/src/Views/blocks/avatar.blade.php
new file mode 100644
index 00000000..51246c56
--- /dev/null
+++ b/src/Views/blocks/avatar.blade.php
@@ -0,0 +1,18 @@
+<div class="chatter_avatar">
+    @if(Config::get('chatter.user.avatar_image_database_field') && $discussion->user->{Config::get('chatter.user.avatar_image_database_field')})
+
+        <?php $db_field = Config::get('chatter.user.avatar_image_database_field'); ?>
+
+        <!-- If the user db field contains http:// or https:// we don't need to use the relative path to the image assets -->
+        @if(Str::startsWith('http://', $user->{Config::get('chatter.user.avatar_image_database_field')}) || Str::startsWith('https://', $discussion->user->{Config::get('chatter.user.avatar_image_database_field')}))
+            <img src="{{ $discussion->user->{Config::get('chatter.user.avatar_image_database_field')}  }}">
+        @else
+            <img src="{{ config('chatter.user.relative_url_to_image_assets') . $discussion->user->{Config::get('chatter.user.avatar_image_database_field')}  }}">
+        @endif
+
+    @else
+        <span class="chatter_avatar_circle" style="background-color:#<?php echo \DevDojo\Chatter\Helpers\ChatterHelper::stringToColorCode($discussion->user->{Config::get('chatter.user.database_field_with_user_name')}) ?>">
+            {{ ucfirst(substr($discussion->user->{Config::get('chatter.user.database_field_with_user_name')}, 0, 1)) }}
+        </span>
+    @endif
+</div>
diff --git a/src/Views/blocks/search-count.blade.php b/src/Views/blocks/search-count.blade.php
new file mode 100644
index 00000000..ff5c1210
--- /dev/null
+++ b/src/Views/blocks/search-count.blade.php
@@ -0,0 +1,5 @@
+@if (isset($query) && $discussions->total() > 0)
+<div class="chatter-search-count-container">
+    <h3 class="font-weight-black mb-3">{{ $discussions->total() }} {{ Str::plural('result', $discussions->total()) }} found</h3>
+</div>
+@endif
diff --git a/src/Views/blocks/search-empty.blade.php b/src/Views/blocks/search-empty.blade.php
new file mode 100644
index 00000000..17ef6d0d
--- /dev/null
+++ b/src/Views/blocks/search-empty.blade.php
@@ -0,0 +1,14 @@
+<div class="no-results px-3 py-3 px-sm-5 py-sm-5 d-flex flex-column align-items-center justify-content-center">
+    <h4 class="font-weight-black mb-2">No discussion found...</h4>
+    <p class="lead mb-4">
+        We couldn't find results for the search <b><i>"{{ $query }}"</i></b>.
+    </p>
+    @if (auth()->check())
+    <button class="btn btn-primary new_discussion_btn">
+        <i class="fal fa-comment-alt"></i> Start A New Discussion</button>
+    @else
+    <a class="btn btn-primary" href="{{ route('login', ['redirect_to' => url()->current()]) }}">
+        <i class="fal fa-comment-alt"></i> Login To Start A New Discussion
+    </a>
+    @endif
+</div>
diff --git a/src/Views/blocks/search.blade.php b/src/Views/blocks/search.blade.php
new file mode 100644
index 00000000..daa818b3
--- /dev/null
+++ b/src/Views/blocks/search.blade.php
@@ -0,0 +1,6 @@
+<form class="form-inline w-100" action="{{ route('chatter.discussion.search') }}">
+    <div class="form-group flex-fill mb-2">
+        <input type="text" class="form-control" name="q" placeholder="Search...">
+    </div>
+    <button type="submit" class="btn btn-primary mb-2">Search</button>
+</form>
\ No newline at end of file
diff --git a/src/Views/discussion.blade.php b/src/Views/discussion.blade.php
index 28a14fa9..fdc48f26 100644
--- a/src/Views/discussion.blade.php
+++ b/src/Views/discussion.blade.php
@@ -24,8 +24,8 @@
 
 	<div id="chatter_header" style="background-color:{{ $discussion->color }}">
 		<div class="container">
-			<a class="back_btn" href="/{{ Config::get('chatter.routes.home') }}"><i class="chatter-back"></i></a>
-			<h1>{{ $discussion->title }}</h1><span class="chatter_head_details"> @lang('chatter::messages.discussion.head_details')<a class="chatter_cat" href="/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.category') }}/{{ $discussion->category->slug }}" style="background-color:{{ $discussion->category->color }}">{{ $discussion->category->name }}</a></span>
+			<a class="back_btn" href="{{ route('chatter.home') }}"><i class="chatter-back"></i></a>
+			<h1>{{ $discussion->title }}</h1><span class="chatter_head_details"> @lang('chatter::messages.discussion.head_details')<a class="chatter_cat" href="{{ route('chatter.category.show', $discussion->category->slug) }}" style="background-color:{{ $discussion->category->color }}">{{ $discussion->category->name }}</a></span>
 		</div>
 	</div>
 
@@ -65,12 +65,12 @@
                 <div class="col-md-3 left-column">
                     <!-- SIDEBAR -->
                     <div class="chatter_sidebar">
-                        <button class="btn btn-primary" id="new_discussion_btn"><i class="chatter-new"></i> @lang('chatter::messages.discussion.new')</button>
-                        <a href="/{{ Config::get('chatter.routes.home') }}"><i class="chatter-bubble"></i> @lang('chatter::messages.discussion.all')</a>
+                        <button class="btn btn-primary new_discussion_btn"><i class="chatter-new"></i> @lang('chatter::messages.discussion.new')</button>
+                        <a href="{{ route('chatter.home') }}"><i class="chatter-bubble"></i> @lang('chatter::messages.discussion.all')</a>
                         <ul class="nav nav-pills nav-stacked">
                             <?php $categories = DevDojo\Chatter\Models\Models::category()->all(); ?>
                             @foreach($categories as $category)
-                                <li><a href="/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.category') }}/{{ $category->slug }}"><div class="chatter-box" style="background-color:{{ $category->color }}"></div> {{ $category->name }}</a></li>
+                                <li><a href="{{ route('chatter.category.show', $category->slug) }}"><div class="chatter-box" style="background-color:{{ $category->color }}"></div> {{ $category->name }}</a></li>
                             @endforeach
                         </ul>
                     </div>
@@ -99,24 +99,8 @@
 			                				</p>
 			                			</div>
 			                		@endif
-			                		<div class="chatter_avatar">
-					        			@if(Config::get('chatter.user.avatar_image_database_field'))
 
-					        				<?php $db_field = Config::get('chatter.user.avatar_image_database_field'); ?>
-
-					        				<!-- If the user db field contains http:// or https:// we don't need to use the relative path to the image assets -->
-					        				@if( (substr($post->user->{$db_field}, 0, 7) == 'http://') || (substr($post->user->{$db_field}, 0, 8) == 'https://') )
-					        					<img src="{{ $post->user->{$db_field}  }}">
-					        				@else
-					        					<img src="{{ Config::get('chatter.user.relative_url_to_image_assets') . $post->user->{$db_field}  }}">
-					        				@endif
-
-					        			@else
-					        				<span class="chatter_avatar_circle" style="background-color:#<?= \DevDojo\Chatter\Helpers\ChatterHelper::stringToColorCode($post->user->{Config::get('chatter.user.database_field_with_user_name')}) ?>">
-					        					{{ ucfirst(substr($post->user->{Config::get('chatter.user.database_field_with_user_name')}, 0, 1)) }}
-					        				</span>
-					        			@endif
-					        		</div>
+                                    @include('chatter::blocks.avatar', ['user' => $post->user])
 
 					        		<div class="chatter_middle">
 					        			<span class="chatter_middle_details"><a href="{{ \DevDojo\Chatter\Helpers\ChatterHelper::userLink($post->user) }}">{{ ucfirst($post->user->{Config::get('chatter.user.database_field_with_user_name')}) }}</a> <span class="ago chatter_middle_details">{{ \Carbon\Carbon::createFromTimeStamp(strtotime($post->created_at))->diffForHumans() }}</span></span>
@@ -124,10 +108,10 @@
 
 					        				@if($post->markdown)
 					        					<pre class="chatter_body_md">{{ $post->body }}</pre>
-					        					<?= \DevDojo\Chatter\Helpers\ChatterHelper::demoteHtmlHeaderTags( GrahamCampbell\Markdown\Facades\Markdown::convertToHtml( $post->body ) ); ?>
+					        					<?php echo \DevDojo\Chatter\Helpers\ChatterHelper::demoteHtmlHeaderTags( GrahamCampbell\Markdown\Facades\Markdown::convertToHtml( $post->body ) ); ?>
 					        					<!--?= GrahamCampbell\Markdown\Facades\Markdown::convertToHtml( $post->body ); ?-->
 					        				@else
-					        					<?= $post->body; ?>
+					        					<?php echo $post->body; ?>
 					        				@endif
 
 					        			</div>
@@ -161,7 +145,7 @@
 		        				@endif
 
 		        			@else
-		        				<span class="chatter_avatar_circle" style="background-color:#<?= \DevDojo\Chatter\Helpers\ChatterHelper::stringToColorCode(Auth::user()->{Config::get('chatter.user.database_field_with_user_name')}) ?>">
+		        				<span class="chatter_avatar_circle" style="background-color:#<?php echo \DevDojo\Chatter\Helpers\ChatterHelper::stringToColorCode(Auth::user()->{Config::get('chatter.user.database_field_with_user_name')}) ?>">
 		        					{{ strtoupper(substr(Auth::user()->{Config::get('chatter.user.database_field_with_user_name')}, 0, 1)) }}
 		        				</span>
 		        			@endif
@@ -174,7 +158,7 @@
 							    <div></div>
 							</div>
 
-				            <form id="chatter_form_editor" action="/{{ Config::get('chatter.routes.home') }}/posts" method="POST">
+				            <form id="chatter_form_editor" action="{{ route('chatter.posts.store') }}" method="POST">
 
 						        <!-- BODY -->
 						    	<div id="editor">
@@ -215,7 +199,7 @@
 
 					<div id="login_or_register">
 						<p>
-                            @lang('chatter::messages.auth', ['home' => Config::get('chatter.routes.home')])
+                            {!! __('chatter::messages.auth') !!}
                         </p>
 					</div>
 
@@ -234,7 +218,7 @@
                 <div></div>
             </div>
 
-            <form id="chatter_form_editor_in_discussion_view" action="/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.discussion') }}" method="POST">
+            <form id="chatter_form_editor_in_discussion_view" action="{{ route('chatter.discussion.store') }}" method="POST">
                 <div class="row">
                     <div class="col-md-7">
                         <!-- TITLE -->
@@ -277,7 +261,7 @@
                 <div id="new_discussion_footer">
                     <input type='text' id="color" name="color" /><span class="select_color_text">@lang('chatter::messages.editor.tinymce_placeholder')</span>
                     <button id="submit_discussion" class="btn btn-success pull-right"><i class="chatter-new"></i> Create {{ Config::get('chatter.titles.discussion') }}</button>
-                    <a href="/{{ Config::get('chatter.routes.home') }}" class="btn btn-default pull-right" id="cancel_discussion">Cancel</a>
+                    <a href="{{ route('chatter.home') }}" class="btn btn-default pull-right" id="cancel_discussion">Cancel</a>
                     <div style="clear:both"></div>
                 </div>
             </form>
@@ -323,7 +307,7 @@
 @endif
 
 @if(Config::get('chatter.sidebar_in_discussion_view'))
-    <script src="/vendor/devdojo/chatter/assets/vendor/spectrum/spectrum.js"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/vendor/spectrum/spectrum.js') }}"></script>
 @endif
 
 <script>
@@ -403,7 +387,7 @@
                 @endif
 			}
 
-			$.form('/{{ Config::get('chatter.routes.home') }}/posts/' + post_id, { _token: '{{ csrf_token() }}', _method: 'PATCH', 'body' : update_body }, 'POST').submit();
+			$.form('{{ str_replace('/holder', '/', route('chatter.posts.update', 'holder')) }}' + post_id, { _token: '{{ csrf_token() }}', _method: 'PATCH', 'body' : update_body }, 'POST').submit();
 		});
 
 		$('#submit_response').click(function(){
@@ -428,7 +412,7 @@
 
 		$('.delete_response').click(function(){
 			post_id = $(this).parents('li').data('id');
-			$.form('/{{ Config::get('chatter.routes.home') }}/posts/' + post_id, { _token: '{{ csrf_token() }}', _method: 'DELETE'}, 'POST').submit();
+			$.form('{{ str_replace('/holder', '/', route('chatter.posts.destroy', 'holder')) }}' + post_id, { _token: '{{ csrf_token() }}', _method: 'DELETE'}, 'POST').submit();
 		});
 
 		// logic for when a new discussion needs to be created from the slideUp
@@ -436,9 +420,9 @@
             $('.chatter-close, #cancel_discussion').click(function(){
                 $('#new_discussion_in_discussion_view').slideUp();
             });
-            $('#new_discussion_btn').click(function(){
+            $('.new_discussion_btn').click(function(){
                 @if(Auth::guest())
-                    window.location.href = "/{{ Config::get('chatter.routes.home') }}/login";
+                    window.location.href = "{{ route('chatter.login') }}";
                 @else
                     $('#new_discussion_in_discussion_view').slideDown();
                     $('#title').focus();
@@ -461,7 +445,6 @@
                 $('#title').focus();
             @endif
         @endif
-
 	});
 </script>
 
diff --git a/src/Views/email.blade.php b/src/Views/email.blade.php
index 898ecfc5..c1ae50fa 100644
--- a/src/Views/email.blade.php
+++ b/src/Views/email.blade.php
@@ -102,7 +102,7 @@
                             </tr>
                           </tbody>
                         </table>
-                        <p style="font-family:sans-serif;font-size:14px;font-weight:normal;margin:0;Margin-bottom:15px;">@lang('chatter::email.unsuscribe.message')</p>
+                        <p style="font-family:sans-serif;font-size:14px;font-weight:normal;margin:0;Margin-bottom:15px;">@lang('chatter::email.unsubscribe.message')</p>
                         <p style="font-family:sans-serif;font-size:14px;font-weight:normal;margin:0;Margin-bottom:15px;">@lang('chatter::email.farewell')</p>
                       </td>
                     </tr>
@@ -116,7 +116,7 @@
               <table border="0" cellpadding="0" cellspacing="0" style="border-collapse:separate;mso-table-lspace:0pt;mso-table-rspace:0pt;width:100%;">
                 <tr>
                   <td class="content-block" style="font-family:sans-serif;font-size:14px;vertical-align:top;color:#999999;font-size:12px;text-align:center;">
-                     @lang('chatter::email.unsuscribe.action') <a href="{{ url('/') }}/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.discussion') }}/{{ $discussion->category->slug }}/{{ $discussion->slug }}" style="color:#3498db;text-decoration:underline;color:#999999;font-size:12px;text-align:center;">@lang('chatter::email.unsuscribe.link')</a>.
+                     @lang('chatter::email.unsubscribe.action') <a href="{{ url('/') }}/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.discussion') }}/{{ $discussion->category->slug }}/{{ $discussion->slug }}" style="color:#3498db;text-decoration:underline;color:#999999;font-size:12px;text-align:center;">@lang('chatter::email.unsuscribe.link')</a>.
                   </td>
                 </tr>
               </table>
diff --git a/src/Views/home.blade.php b/src/Views/home.blade.php
index 691258cd..18ade8dc 100644
--- a/src/Views/home.blade.php
+++ b/src/Views/home.blade.php
@@ -2,185 +2,169 @@
 
 @section(Config::get('chatter.yields.head'))
     <link href="{{ url('/vendor/devdojo/chatter/assets/vendor/spectrum/spectrum.css') }}" rel="stylesheet">
-	<link href="{{ url('/vendor/devdojo/chatter/assets/css/chatter.css') }}" rel="stylesheet">
-	@if($chatter_editor == 'simplemde')
-		<link href="{{ url('/vendor/devdojo/chatter/assets/css/simplemde.min.css') }}" rel="stylesheet">
-	@elseif($chatter_editor == 'trumbowyg')
-		<link href="{{ url('/vendor/devdojo/chatter/assets/vendor/trumbowyg/ui/trumbowyg.css') }}" rel="stylesheet">
-		<style>
-			.trumbowyg-box, .trumbowyg-editor {
-				margin: 0px auto;
-			}
-		</style>
-	@endif
+    <link href="{{ url('/vendor/devdojo/chatter/assets/css/chatter.css') }}" rel="stylesheet">
+    @if($chatter_editor == 'simplemde')
+        <link href="{{ url('/vendor/devdojo/chatter/assets/css/simplemde.min.css') }}" rel="stylesheet">
+    @elseif($chatter_editor == 'trumbowyg')
+        <link href="{{ url('/vendor/devdojo/chatter/assets/vendor/trumbowyg/ui/trumbowyg.css') }}" rel="stylesheet">
+        <style>
+            .trumbowyg-box, .trumbowyg-editor {
+                margin: 0px auto;
+            }
+        </style>
+    @endif
 @stop
 
 @section('content')
 
 <div id="chatter" class="chatter_home">
 
-	<div id="chatter_hero">
-		<div id="chatter_hero_dimmer"></div>
-		<?php $headline_logo = Config::get('chatter.headline_logo'); ?>
-		@if( isset( $headline_logo ) && !empty( $headline_logo ) )
-			<img src="{{ Config::get('chatter.headline_logo') }}">
-		@else
-			<h1>@lang('chatter::intro.headline')</h1>
-			<p>@lang('chatter::intro.description')</p>
-		@endif
-	</div>
-
-	@if(config('chatter.errors'))
-		@if(Session::has('chatter_alert'))
-			<div class="chatter-alert alert alert-{{ Session::get('chatter_alert_type') }}">
-				<div class="container">
-					<strong><i class="chatter-alert-{{ Session::get('chatter_alert_type') }}"></i> {{ Config::get('chatter.alert_messages.' . Session::get('chatter_alert_type')) }}</strong>
-					{{ Session::get('chatter_alert') }}
-					<i class="chatter-close"></i>
-				</div>
-			</div>
-			<div class="chatter-alert-spacer"></div>
-		@endif
-
-		@if (count($errors) > 0)
-			<div class="chatter-alert alert alert-danger">
-				<div class="container">
-					<p><strong><i class="chatter-alert-danger"></i> @lang('chatter::alert.danger.title')</strong> @lang('chatter::alert.danger.reason.errors')</p>
-					<ul>
-						@foreach ($errors->all() as $error)
-							<li>{{ $error }}</li>
-						@endforeach
-					</ul>
-				</div>
-			</div>
-		@endif
-	@endif
-
-	<div class="container chatter_container">
-
-	    <div class="row">
-
-	    	<div class="col-md-3 left-column">
-	    		<!-- SIDEBAR -->
-	    		<div class="chatter_sidebar">
-					<button class="btn btn-primary" id="new_discussion_btn"><i class="chatter-new"></i> @lang('chatter::messages.discussion.new')</button>
-					<a href="/{{ Config::get('chatter.routes.home') }}"><i class="chatter-bubble"></i> @lang('chatter::messages.discussion.all')</a>
-          {!! $categoriesMenu !!}
-				</div>
-				<!-- END SIDEBAR -->
-	    	</div>
-	        <div class="col-md-9 right-column">
-	        	<div class="panel">
-		        	<ul class="discussions">
-		        		@foreach($discussions as $discussion)
-				        	<li>
-				        		<a class="discussion_list" href="/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.discussion') }}/{{ $discussion->category->slug }}/{{ $discussion->slug }}">
-					        		<div class="chatter_avatar">
-					        			@if(Config::get('chatter.user.avatar_image_database_field'))
-
-					        				<?php $db_field = Config::get('chatter.user.avatar_image_database_field'); ?>
-
-					        				<!-- If the user db field contains http:// or https:// we don't need to use the relative path to the image assets -->
-					        				@if( (substr($discussion->user->{$db_field}, 0, 7) == 'http://') || (substr($discussion->user->{$db_field}, 0, 8) == 'https://') )
-					        					<img src="{{ $discussion->user->{$db_field}  }}">
-					        				@else
-					        					<img src="{{ Config::get('chatter.user.relative_url_to_image_assets') . $discussion->user->{$db_field}  }}">
-					        				@endif
-
-					        			@else
-
-					        				<span class="chatter_avatar_circle" style="background-color:#<?= \DevDojo\Chatter\Helpers\ChatterHelper::stringToColorCode($discussion->user->{Config::get('chatter.user.database_field_with_user_name')}) ?>">
-					        					{{ strtoupper(substr($discussion->user->{Config::get('chatter.user.database_field_with_user_name')}, 0, 1)) }}
-					        				</span>
-
-					        			@endif
-					        		</div>
-
-					        		<div class="chatter_middle">
-					        			<h3 class="chatter_middle_title">{{ $discussion->title }} <div class="chatter_cat" style="background-color:{{ $discussion->category->color }}">{{ $discussion->category->name }}</div></h3>
-					        			<span class="chatter_middle_details">@lang('chatter::messages.discussion.posted_by') <span data-href="/user">{{ ucfirst($discussion->user->{Config::get('chatter.user.database_field_with_user_name')}) }}</span> {{ \Carbon\Carbon::createFromTimeStamp(strtotime($discussion->created_at))->diffForHumans() }}</span>
-					        			@if($discussion->post[0]->markdown)
-					        				<?php $discussion_body = GrahamCampbell\Markdown\Facades\Markdown::convertToHtml( $discussion->post[0]->body ); ?>
-					        			@else
-					        				<?php $discussion_body = $discussion->post[0]->body; ?>
-					        			@endif
-					        			<p>{{ substr(strip_tags($discussion_body), 0, 200) }}@if(strlen(strip_tags($discussion_body)) > 200){{ '...' }}@endif</p>
-					        		</div>
-
-					        		<div class="chatter_right">
-
-					        			<div class="chatter_count"><i class="chatter-bubble"></i> {{ $discussion->postsCount[0]->total }}</div>
-					        		</div>
-
-					        		<div class="chatter_clear"></div>
-					        	</a>
-				        	</li>
-			        	@endforeach
-		        	</ul>
-	        	</div>
-
-	        	<div id="pagination">
-	        		{{ $discussions->links() }}
-	        	</div>
-
-	        </div>
-	    </div>
-	</div>
-
-	<div id="new_discussion">
-
-
-    	<div class="chatter_loader dark" id="new_discussion_loader">
-		    <div></div>
-		</div>
-
-    	<form id="chatter_form_editor" action="/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.discussion') }}" method="POST">
-        	<div class="row">
-	        	<div class="col-md-7">
-		        	<!-- TITLE -->
-	                <input type="text" class="form-control" id="title" name="title" placeholder="@lang('chatter::messages.editor.title')" value="{{ old('title') }}" >
-	            </div>
-
-	            <div class="col-md-4">
-		            <!-- CATEGORY -->
-					<select id="chatter_category_id" class="form-control" name="chatter_category_id">
-						<option value="">@lang('chatter::messages.editor.select')</option>
-						@foreach($categories as $category)
-							@if(old('chatter_category_id') == $category->id)
-								<option value="{{ $category->id }}" selected>{{ $category->name }}</option>
-							@elseif(!empty($current_category_id) && $current_category_id == $category->id)
-								<option value="{{ $category->id }}" selected>{{ $category->name }}</option>
-							@else
-								<option value="{{ $category->id }}">{{ $category->name }}</option>
-							@endif
-						@endforeach
-					</select>
-		        </div>
-
-		        <div class="col-md-1">
-		        	<i class="chatter-close"></i>
-		        </div>
-	        </div><!-- .row -->
+    @if( ($headline_logo = Config::get('chatter.headline_logo')) !== false )
+    <div id="chatter_hero">
+        <div id="chatter_hero_dimmer"></div>
+        @if( !empty( $headline_logo ) )
+            <img src="{{ asset($headline_logo) }}">
+        @else
+            <h1>@lang('chatter::intro.headline')</h1>
+            <p>@lang('chatter::intro.description')</p>
+        @endif
+    </div>
+    @endif
+
+    @if(config('chatter.errors'))
+        @if(Session::has('chatter_alert'))
+            <div class="chatter-alert alert alert-{{ Session::get('chatter_alert_type') }}">
+                <div class="container">
+                    <strong><i class="chatter-alert-{{ Session::get('chatter_alert_type') }}"></i> {{ Config::get('chatter.alert_messages.' . Session::get('chatter_alert_type')) }}</strong>
+                    {{ Session::get('chatter_alert') }}
+                    <i class="chatter-close"></i>
+                </div>
+            </div>
+            <div class="chatter-alert-spacer"></div>
+        @endif
+
+        @if (count($errors) > 0)
+            <div class="chatter-alert alert alert-danger">
+                <div class="container">
+                    <p><strong><i class="chatter-alert-danger"></i> @lang('chatter::alert.danger.title')</strong> @lang('chatter::alert.danger.reason.errors')</p>
+                    <ul>
+                        @foreach ($errors->all() as $error)
+                            <li>{{ $error }}</li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        @endif
+    @endif
+
+    <div class="container chatter_container">
+
+        <div class="row">
+
+            <div class="col-md-3 left-column">
+                <!-- SIDEBAR -->
+                <div class="chatter_sidebar">
+                    <button class="btn btn-primary new_discussion_button"><i class="chatter-new"></i> @lang('chatter::messages.discussion.new')</button>
+                    <a href="{{ route('chatter.home') }}"><i class="chatter-bubble"></i> @lang('chatter::messages.discussion.all')</a>
+                    {!! $categoriesMenu !!}
+                </div>
+                <!-- END SIDEBAR -->
+            </div>
+            <div class="col-md-9 right-column">
+                @includeWhen(env('SCOUT_DRIVER'), 'chatter::blocks.search')
+                <div class="panel">
+                    <ul class="discussions">
+                        @includeWhen(env('SCOUT_DRIVER'), 'chatter::blocks.search-count')
+                        @if ($discussions->count() > 0)
+                            @foreach($discussions as $discussion)
+                                <li>
+                                    <a class="discussion_list" href="{{ route('chatter.discussion.showInCategory', [$discussion->category->slug, $discussion->slug]) }}">
+                                        @include('chatter::blocks.avatar')
+
+                                        <div class="chatter_middle">
+                                            <h3 class="chatter_middle_title">{{ $discussion->title }} <div class="chatter_cat" style="background-color:{{ $discussion->category->color }}">{{ $discussion->category->name }}</div></h3>
+                                            <span class="chatter_middle_details">@lang('chatter::messages.discussion.posted_by') <span data-href="/user">{{ ucfirst($discussion->user->{Config::get('chatter.user.database_field_with_user_name')}) }}</span> {{ \Carbon\Carbon::createFromTimeStamp(strtotime($discussion->created_at))->diffForHumans() }}</span>
+
+                                            <p>{!! str_limit(strip_tags($discussion->post->body), 200) !!}</p>
+                                        </div>
+
+                                        <div class="chatter_right">
+
+                                            <div class="chatter_count"><i class="chatter-bubble"></i> {{ $discussion->posts()->count() - 1 }}</div>
+                                        </div>
+
+                                        <div class="chatter_clear"></div>
+                                    </a>
+                                </li>
+                            @endforeach
+                        @else
+                            @includeWhen(env('SCOUT_DRIVER'), 'chatter::blocks.search-empty')
+                        @endif
+                    </ul>
+                </div>
+
+                <div id="pagination">
+                    {{ $discussions->appends(['q' => request('q')])->links() }}
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <div id="new_discussion">
+
+
+        <div class="chatter_loader dark" id="new_discussion_loader">
+            <div></div>
+        </div>
+
+        <form id="chatter_form_editor" action="/{{ Config::get('chatter.routes.home') }}/{{ Config::get('chatter.routes.discussion') }}" method="POST">
+            <div class="row">
+                <div class="col-md-7">
+                    <!-- TITLE -->
+                    <input type="text" class="form-control" id="title" name="title" placeholder="@lang('chatter::messages.editor.title')" value="{{ old('title') }}" >
+                </div>
+
+                <div class="col-md-4">
+                    <!-- CATEGORY -->
+                    <select id="chatter_category_id" class="form-control" name="chatter_category_id">
+                        <option value="">@lang('chatter::messages.editor.select')</option>
+                        @foreach($categories as $category)
+                            @if(old('chatter_category_id') == $category->id)
+                                <option value="{{ $category->id }}" selected>{{ $category->name }}</option>
+                            @elseif(!empty($current_category_id) && $current_category_id == $category->id)
+                                <option value="{{ $category->id }}" selected>{{ $category->name }}</option>
+                            @else
+                                <option value="{{ $category->id }}">{{ $category->name }}</option>
+                            @endif
+                        @endforeach
+                    </select>
+                </div>
+
+                <div class="col-md-1">
+                    <i class="chatter-close"></i>
+                </div>
+            </div><!-- .row -->
 
             <!-- BODY -->
-        	<div id="editor">
-        		@if( $chatter_editor == 'tinymce' || empty($chatter_editor) )
-					<label id="tinymce_placeholder">@lang('chatter::messages.editor.tinymce_placeholder')</label>
-    				<textarea id="body" class="richText" name="body" placeholder="">{{ old('body') }}</textarea>
-    			@elseif($chatter_editor == 'simplemde')
-    				<textarea id="simplemde" name="body" placeholder="">{{ old('body') }}</textarea>
-				@elseif($chatter_editor == 'trumbowyg')
-					<textarea class="trumbowyg" name="body" placeholder="@lang('chatter::messages.editor.tinymce_placeholder')">{{ old('body') }}</textarea>
-				@endif
-    		</div>
+            <div id="editor">
+                @if( $chatter_editor == 'tinymce' || empty($chatter_editor) )
+                    <label id="tinymce_placeholder">@lang('chatter::messages.editor.tinymce_placeholder')</label>
+                    <textarea id="body" class="richText" name="body" placeholder="">{{ old('body') }}</textarea>
+                @elseif($chatter_editor == 'simplemde')
+                    <textarea id="simplemde" name="body" placeholder="">{{ old('body') }}</textarea>
+                @elseif($chatter_editor == 'trumbowyg')
+                    <textarea class="trumbowyg" name="body" placeholder="@lang('chatter::messages.editor.tinymce_placeholder')">{{ old('body') }}</textarea>
+                @endif
+            </div>
 
             <input type="hidden" name="_token" id="csrf_token_field" value="{{ csrf_token() }}">
 
             <div id="new_discussion_footer">
-            	<input type='text' id="color" name="color" /><span class="select_color_text">@lang('chatter::messages.editor.select_color_text')</span>
-            	<button id="submit_discussion" class="btn btn-success pull-right"><i class="chatter-new"></i> @lang('chatter::messages.discussion.create')</button>
-            	<a href="/{{ Config::get('chatter.routes.home') }}" class="btn btn-default pull-right" id="cancel_discussion">@lang('chatter::messages.words.cancel')</a>
-            	<div style="clear:both"></div>
+                <input type='text' id="color" name="color" /><span class="select_color_text">@lang('chatter::messages.editor.select_color_text')</span>
+                <button id="submit_discussion" class="btn btn-success pull-right"><i class="chatter-new"></i> @lang('chatter::messages.discussion.create')</button>
+                <a href="{{ route('chatter.home') }}" class="btn btn-default pull-right" id="cancel_discussion">@lang('chatter::messages.words.cancel')</a>
+                <div style="clear:both"></div>
             </div>
         </form>
 
@@ -189,8 +173,8 @@
 </div>
 
 @if( $chatter_editor == 'tinymce' || empty($chatter_editor) )
-	<input type="hidden" id="chatter_tinymce_toolbar" value="{{ Config::get('chatter.tinymce.toolbar') }}">
-	<input type="hidden" id="chatter_tinymce_plugins" value="{{ Config::get('chatter.tinymce.plugins') }}">
+    <input type="hidden" id="chatter_tinymce_toolbar" value="{{ Config::get('chatter.tinymce.toolbar') }}">
+    <input type="hidden" id="chatter_tinymce_plugins" value="{{ Config::get('chatter.tinymce.plugins') }}">
 @endif
 <input type="hidden" id="current_path" value="{{ Request::path() }}">
 
@@ -200,59 +184,60 @@
 
 
 @if( $chatter_editor == 'tinymce' || empty($chatter_editor) )
-	<script src="{{ url('/vendor/devdojo/chatter/assets/vendor/tinymce/tinymce.min.js') }}"></script>
-	<script src="{{ url('/vendor/devdojo/chatter/assets/js/tinymce.js') }}"></script>
-	<script>
-		var my_tinymce = tinyMCE;
-		$('document').ready(function(){
-			$('#tinymce_placeholder').click(function(){
-				my_tinymce.activeEditor.focus();
-			});
-		});
-	</script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/vendor/tinymce/tinymce.min.js') }}"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/js/tinymce.js') }}"></script>
+    <script>
+        var my_tinymce = tinyMCE;
+        $('document').ready(function(){
+            $('#tinymce_placeholder').click(function(){
+                my_tinymce.activeEditor.focus();
+            });
+        });
+    </script>
 @elseif($chatter_editor == 'simplemde')
-	<script src="{{ url('/vendor/devdojo/chatter/assets/js/simplemde.min.js') }}"></script>
-	<script src="{{ url('/vendor/devdojo/chatter/assets/js/chatter_simplemde.js') }}"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/js/simplemde.min.js') }}"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/js/chatter_simplemde.js') }}"></script>
 @elseif($chatter_editor == 'trumbowyg')
-	<script src="{{ url('/vendor/devdojo/chatter/assets/vendor/trumbowyg/trumbowyg.min.js') }}"></script>
-	<script src="{{ url('/vendor/devdojo/chatter/assets/vendor/trumbowyg/plugins/preformatted/trumbowyg.preformatted.min.js') }}"></script>
-	<script src="{{ url('/vendor/devdojo/chatter/assets/js/trumbowyg.js') }}"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/vendor/trumbowyg/trumbowyg.min.js') }}"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/vendor/trumbowyg/plugins/preformatted/trumbowyg.preformatted.min.js') }}"></script>
+    <script src="{{ url('/vendor/devdojo/chatter/assets/js/trumbowyg.js') }}"></script>
 @endif
 
 <script src="{{ url('/vendor/devdojo/chatter/assets/vendor/spectrum/spectrum.js') }}"></script>
 <script src="{{ url('/vendor/devdojo/chatter/assets/js/chatter.js') }}"></script>
 <script>
-	$('document').ready(function(){
-
-		$('.chatter-close, #cancel_discussion').click(function(){
-			$('#new_discussion').slideUp();
-		});
-		$('#new_discussion_btn').click(function(){
-			@if(Auth::guest())
-				window.location.href = "{{ route('login') }}";
-			@else
-				$('#new_discussion').slideDown();
-				$('#title').focus();
-			@endif
-		});
-
-		$("#color").spectrum({
-		    color: "#333639",
-		    preferredFormat: "hex",
-		    containerClassName: 'chatter-color-picker',
-		    cancelText: '',
-    		chooseText: 'close',
-		    move: function(color) {
-				$("#color").val(color.toHexString());
-			}
-		});
-
-		@if (count($errors) > 0)
-			$('#new_discussion').slideDown();
-			$('#title').focus();
-		@endif
-
-
-	});
+    $('document').ready(function(){
+
+        $('.chatter-close, #cancel_discussion').click(function(){
+            $('#new_discussion').slideUp();
+        });
+
+        $('.new_discussion_btn').click(function(){
+            @if(Auth::guest())
+                window.location.href = "{{ route('login') }}";
+            @else
+                $('#new_discussion').slideDown();
+                $('#title').focus();
+            @endif
+        });
+
+        $("#color").spectrum({
+            color: "#333639",
+            preferredFormat: "hex",
+            containerClassName: 'chatter-color-picker',
+            cancelText: '',
+            chooseText: 'close',
+            move: function(color) {
+                $("#color").val(color.toHexString());
+            }
+        });
+
+        @if (count($errors) > 0)
+            $('#new_discussion').slideDown();
+            $('#title').focus();
+        @endif
+
+
+    });
 </script>
 @stop