diff --git a/code/app/Http/Controllers/Client/kb/UserController.php b/code/app/Http/Controllers/Client/kb/UserController.php
index ea35387ca..0c4e3b9bd 100644
--- a/code/app/Http/Controllers/Client/kb/UserController.php
+++ b/code/app/Http/Controllers/Client/kb/UserController.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers\client\kb;
+<?php namespace App\Http\Controllers\Client\kb;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\kb\CommentRequest;
diff --git a/code/app/Http/routes.php b/code/app/Http/routes.php
index 4f0ac45e6..334c39cdc 100644
--- a/code/app/Http/routes.php
+++ b/code/app/Http/routes.php
@@ -483,30 +483,30 @@ $router->get('direct', function () {
 
 // Route::get('/',['as'=>'home' , 'uses'=> 'client\kb\UserController@home'] );
 /* post the comment from show page */
-$router->post('postcomment/{slug}',['as'=>'postcomment' , 'uses'=>  'client\kb\UserController@postComment']);
+$router->post('postcomment/{slug}',['as'=>'postcomment' , 'uses'=>  'Client\kb\UserController@postComment']);
 /* get the article list */
-$router->get('article-list',['as'=>'article-list' , 'uses'=> 'client\kb\UserController@getArticle']);
+$router->get('article-list',['as'=>'article-list' , 'uses'=> 'Client\kb\UserController@getArticle']);
 // /* get search values */
-$router->get('search',['as'=>'search', 'uses'=> 'client\kb\UserController@search']);
+$router->get('search',['as'=>'search', 'uses'=> 'Client\kb\UserController@search']);
 /* get the selected article */
-$router->get('show/{slug}',['as'=>'show' , 'uses'=> 'client\kb\UserController@show']);
-$router->get('category-list', ['as'=>'category-list' , 'uses'=> 'client\kb\UserController@getCategoryList']);
+$router->get('show/{slug}',['as'=>'show' , 'uses'=> 'Client\kb\UserController@show']);
+$router->get('category-list', ['as'=>'category-list' , 'uses'=> 'Client\kb\UserController@getCategoryList']);
 /* get the categories with article */
-$router->get('category-list/{id}',['as'=>'categorylist' , 'uses'=>'client\kb\UserController@getCategory']);
+$router->get('category-list/{id}',['as'=>'categorylist' , 'uses'=>'Client\kb\UserController@getCategory']);
 /* get the home page */
-$router->get('home',['as'=>'home' , 'uses'=> 'client\kb\UserController@home']);
+$router->get('home',['as'=>'home' , 'uses'=> 'Client\kb\UserController@home']);
 /* get the faq value to user */
-$router->get('faq',['as'=>'faq' , 'uses'=>'client\kb\UserController@Faq'] );
+$router->get('faq',['as'=>'faq' , 'uses'=>'Client\kb\UserController@Faq'] );
 /* get the cantact page to user */
-$router->get('contact',['as'=>'contact' , 'uses'=> 'client\kb\UserController@contact']);
+$router->get('contact',['as'=>'contact' , 'uses'=> 'Client\kb\UserController@contact']);
 /* post the cantact page to controller */
-$router->post('post-contact',['as'=>'post-contact' , 'uses'=> 'client\kb\UserController@postContact']);
+$router->post('post-contact',['as'=>'post-contact' , 'uses'=> 'Client\kb\UserController@postContact']);
 //to get the value for page content
-$router->get('pages/{name}', ['as' => 'pages', 'uses' =>'client\kb\UserController@getPage']);
+$router->get('pages/{name}', ['as' => 'pages', 'uses' =>'Client\kb\UserController@getPage']);
 //profile
-$router->get('client-profile',['as' => 'client-profile', 'uses' => 'client\kb\UserController@clientProfile']);
-Route::patch('client-profile-edit',['as' => 'client-profile-edit', 'uses' => 'client\kb\UserController@postClientProfile']);
-Route::patch('client-profile-password/{id}',['as' => 'client-profile-password', 'uses' => 'client\kb\UserController@postClientProfilePassword']);
+$router->get('client-profile',['as' => 'client-profile', 'uses' => 'Client\kb\UserController@clientProfile']);
+Route::patch('client-profile-edit',['as' => 'client-profile-edit', 'uses' => 'Client\kb\UserController@postClientProfile']);
+Route::patch('client-profile-password/{id}',['as' => 'client-profile-password', 'uses' => 'Client\kb\UserController@postClientProfilePassword']);
 
 
 
diff --git a/code/resources/views/themes/default1/agent/helpdesk/organization/create.blade.php b/code/resources/views/themes/default1/agent/helpdesk/organization/create.blade.php
index ea4725289..d2cc4b8d6 100644
--- a/code/resources/views/themes/default1/agent/helpdesk/organization/create.blade.php
+++ b/code/resources/views/themes/default1/agent/helpdesk/organization/create.blade.php
@@ -79,6 +79,11 @@ class="active"
     </div>
 </div>
 
+<script type="text/javascript">
+        $(function () {
+            $("textarea").wysihtml5();
+        });
+</script>
 
 @section('FooterInclude')
 
diff --git a/code/resources/views/themes/default1/agent/helpdesk/organization/edit.blade.php b/code/resources/views/themes/default1/agent/helpdesk/organization/edit.blade.php
index 7284ba171..9315cf97c 100644
--- a/code/resources/views/themes/default1/agent/helpdesk/organization/edit.blade.php
+++ b/code/resources/views/themes/default1/agent/helpdesk/organization/edit.blade.php
@@ -72,6 +72,11 @@ class="active"
     </div>
 </div>
 
+<script type="text/javascript">
+        $(function () {
+            $("textarea").wysihtml5();
+        });
+</script>
 
 @section('FooterInclude')
 
diff --git a/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php b/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php
index 9ffbfc06f..afc67c206 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php
@@ -39,7 +39,7 @@ $time = UTC::usertimezone($utc);
     <hr>
 
 <?php $str = $arti->description ?>
-<?php $excerpt = App\Http\Controllers\client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 300) ?>
+<?php $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 300) ?>
 
     <p>{!!$excerpt!!} <a class="readmore-link" href="{{route('show',$arti->slug)}}">{!! Lang::get('lang.read_more') !!}</a></p>
 
diff --git a/code/resources/views/themes/default1/client/kb/article-list/category.blade.php b/code/resources/views/themes/default1/client/kb/article-list/category.blade.php
index 862ca4b51..d460fb8df 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/category.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/category.blade.php
@@ -17,7 +17,7 @@
 <div id="content" class="site-content col-md-12">
     <header class="archive-header">
         @foreach($categorys as $category)
-        <h1 class="archive-title">{!! $category->name !!}</h1>
+        <h1 >{!! $category->name !!}</h1>
     </header><!-- .archive-header -->
     <blockquote class="archive-description" style="display: none;">
         <p>{!! $category->description !!}</p>
@@ -33,7 +33,7 @@
                     <h2 class="entry-title h4"><a href="{{url('show/'.$arti->slug)}}" onclick="toggle_visibility('foo');">{{$arti->name}}</a></h2>
                 </header><!-- .entry-header -->
                 <?php $str = $arti->description; ?>
-                <?php $excerpt = App\Http\Controllers\client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 400); ?>
+                <?php $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 400); ?>
                 <blockquote class="archive-description">
                     <p>{!!$excerpt!!}</p><br/>
                     <a class="readmore-link" href="{{url('show/'.$arti->slug)}}">{!! Lang::get('lang.read_more') !!}</a>
diff --git a/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php b/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php
index a0c48e5d2..13da5d3bf 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php
@@ -53,7 +53,7 @@
                         <h4><a href="{{url('show/'.$arti->slug)}}">{{$arti->name}}</a></h4>
                         <span class="article-meta">{{$arti->created_at}}
                             <?php $str = $arti->description ?>
-                            <?php $excerpt = App\Http\Controllers\client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 55) ?>
+                            <?php $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 55) ?>
 
                             <p>{!!$excerpt!!} <a class="readmore-link" href="{{url('show/'.$arti->slug)}}">{!! Lang::get('lang.read_more') !!}</a></p>
                     </li>
diff --git a/code/resources/views/themes/default1/client/kb/article-list/contact.blade.php b/code/resources/views/themes/default1/client/kb/article-list/contact.blade.php
index 2335a6a4a..476d53120 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/contact.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/contact.blade.php
@@ -33,7 +33,7 @@
         <hr>
         <p></p>
     </article>
-    {!! Form::open(['method'=>'post','action'=>'client\kb\UserController@postContact']) !!}
+    {!! Form::open(['method'=>'post','action'=>'Client\kb\UserController@postContact']) !!}
     @if(Session::has('success'))
     <div class="alert alert-success alert-dismissable">
         <i class="fa  fa-check-circle"></i>
diff --git a/code/resources/views/themes/default1/client/kb/article-list/home.blade.php b/code/resources/views/themes/default1/client/kb/article-list/home.blade.php
index eea443e2b..f1546f5f6 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/home.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/home.blade.php
@@ -65,7 +65,7 @@
                             <span class="article-meta">{{$arti->created_at}}</span>
     <?php $str = $arti->description;
     $len = strlen($str); ?>
-                            <?php $excerpt = App\Http\Controllers\client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 50); ?>
+                            <?php $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 50); ?>
                             <p >{!!$excerpt!!} <br/><a class="more-link text-center" href="{{url('show/'.$arti->slug)}}" style="color: orange">{!! Lang::get('lang.read_more') !!}</a></p>
                         </li>
                         @endforeach
diff --git a/code/resources/views/themes/default1/client/kb/article-list/search.blade.php b/code/resources/views/themes/default1/client/kb/article-list/search.blade.php
index 260ebe11b..cbd89d24a 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/search.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/search.blade.php
@@ -23,7 +23,7 @@
             </div><!-- end of post meta -->
         </header>
         <?php $str = $arti->description ?>
-        <?php $excerpt = App\Http\Controllers\client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 100) ?>
+        <?php $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 100) ?>
         <p>{!!$excerpt!!} <a class="readmore-link" href="{{url('show/'.$arti->slug)}}">Read more</a></p>
         @endforeach
     </article>
diff --git a/code/resources/views/themes/default1/client/layout/client.blade.php b/code/resources/views/themes/default1/client/layout/client.blade.php
index 2fd6a6b97..2f42b645b 100644
--- a/code/resources/views/themes/default1/client/layout/client.blade.php
+++ b/code/resources/views/themes/default1/client/layout/client.blade.php
@@ -136,7 +136,7 @@
 				</div><!-- #navbar -->
     					
     					<div id="header-search" class="site-search clearfix" style="padding-bottom:5px"><!-- #header-search -->
-                            {!!Form::open(['method'=>'get','action'=>'client\kb\UserController@search','class'=>'search-form clearfix'])!!}
+                            {!!Form::open(['method'=>'get','action'=>'Client\kb\UserController@search','class'=>'search-form clearfix'])!!}
                             <div class="form-border">
 
                                 <div class="form-inline ">