diff --git a/code/.gitignore b/code/.gitignore
new file mode 100644
index 000000000..dc150eb5d
--- /dev/null
+++ b/code/.gitignore
@@ -0,0 +1,2 @@
+/node_modules
+.env
diff --git a/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php
index b128551a3..45347f937 100644
--- a/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php
+++ b/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php
@@ -78,7 +78,7 @@ class SettingsController extends Controller {
 			$companys = $company->whereId('1')->first();
 			if (Input::file('logo')) {
 				$name = Input::file('logo')->getClientOriginalName();
-				$destinationPath = 'dist';
+				$destinationPath = 'lb-faveo/dist/';
 				$fileName = rand(0000, 9999) . '.' . $name;
 				Input::file('logo')->move($destinationPath, $fileName);
 				$companys->logo = $fileName;
diff --git a/code/app/Http/Controllers/Agent/helpdesk/TicketController.php b/code/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 6fff9bf2e..0977a9a20 100644
--- a/code/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/code/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -640,7 +640,6 @@ class TicketController extends Controller {
 		}
 	}
 
-
 	/**
 	 * Default helptopic
 	 * @return type string
diff --git a/code/app/Http/Controllers/Agent/kb/ArticleController.php b/code/app/Http/Controllers/Agent/kb/ArticleController.php
index 9a7d887d1..c3e02a653 100644
--- a/code/app/Http/Controllers/Agent/kb/ArticleController.php
+++ b/code/app/Http/Controllers/Agent/kb/ArticleController.php
@@ -5,6 +5,7 @@ use App\Http\Controllers\Agent\kb\SettingsController;
 use App\Http\Controllers\Client\kb\UserController;
 use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Requests\kb\ArticleRequest;
+use App\Http\Requests\kb\ArticleUpdate;
 use App\Model\kb\Article;
 use App\Model\kb\Category;
 use App\Model\kb\Relationship;
@@ -62,8 +63,8 @@ class ArticleController extends Controller {
 			->addColumn('Actions', function ($model) {
 				//return '<a href=article/delete/ ' . $model->id . ' class="btn btn-danger btn-flat" onclick="myFunction()">Delete</a>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
 				//return '<form action="article/delete/ ' . $model->id . '" method="post" onclick="alert()"><button type="sumbit" value="Delete"></button></form><a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
-				return '<span  data-toggle="modal" data-target="#banemail"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href=article/' . $model->slug . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=show/'.$model->slug .' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
-				<div class="modal fade" id="banemail">
+				return '<span  data-toggle="modal" data-target="#deletearticle'.$model->id .'"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=show/'.$model->slug .' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
+				<div class="modal fade" id="deletearticle'.$model->id .'">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
@@ -156,7 +157,7 @@ class ArticleController extends Controller {
 	 */
 	public function edit($slug, Article $article, Relationship $relation, Category $category) {
 
-		$aid = $article->where('slug', $slug)->first();
+		$aid = $article->where('id', $slug)->first();
 		$id = $aid->id;
 
 		/* define the selected fields */
@@ -178,13 +179,13 @@ class ArticleController extends Controller {
 	 * @param type ArticleRequest $request
 	 * @return Response
 	 */
-	public function update($slug, Article $article, Relationship $relation,
-		ArticleRequest $request) {
-		$aid = $article->where('slug', $slug)->first();
+	public function update($slug, Article $article, Relationship $relation, ArticleUpdate $request) {
+		$aid = $article->where('id', $slug)->first();
 		$id = $aid->id;
 		$sl = $request->input('slug');
-			$slug = str_slug($sl, "-");
-			$article->slug = $slug;
+		$slug = str_slug($sl, "-");
+		// dd($slug);
+		$article->slug = $slug;
 		/* get the attribute of relation table where id==$id */
 		$relation = $relation->where('article_id', $id);
 		$relation->delete();
@@ -196,8 +197,10 @@ class ArticleController extends Controller {
 			DB::insert('insert into article_relationship (category_id, article_id) values (?,?)', [$req, $id]);
 		}
 		/* update the value to the table */
-		if ($article->fill($request->except('slug'))->save()) //true: redirect to index page with success message
+		if ($article->fill($request->all())->save()) //true: redirect to index page with success message
 		{
+			$article->slug = $slug;
+			$article->save();
 			return redirect('article')->with('success', 'Article Updated Successfully');
 		} else // redirect to index page with fails message
 		{
diff --git a/code/app/Http/Controllers/Agent/kb/CategoryController.php b/code/app/Http/Controllers/Agent/kb/CategoryController.php
index c87801f65..dbc3edbee 100644
--- a/code/app/Http/Controllers/Agent/kb/CategoryController.php
+++ b/code/app/Http/Controllers/Agent/kb/CategoryController.php
@@ -1,9 +1,10 @@
 <?php namespace App\Http\Controllers\Agent\kb;
-use App\Http\Controllers\Client\kb\UserController;
+use App\Http\Controllers\client\kb\UserController;
 use App\Http\Controllers\admin\kb\ArticleController;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Agent\kb\SettingsController;
 use App\Http\Requests\kb\CategoryRequest;
+use App\Http\Requests\kb\CategoryUpdate;
 use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Model\kb\Category;
 use App\Model\kb\Relationship;
@@ -60,8 +61,8 @@ class CategoryController extends Controller {
 			})
 			->addColumn('Actions', function ($model) {
 				//return '<a href=category/delete/' . $model->id . ' class="btn btn-danger btn-flat">Delete</a>&nbsp;<a href=category/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=article-list class="btn btn-warning btn-flat">View</a>';
-				return '<span  data-toggle="modal" data-target="#banemail"><a href="#" ><button class="btn btn-danger btn-xs"></a>'. \Lang::get("lang.delete") .'</button></span>&nbsp;<a href=category/' . $model->slug . '/edit class="btn btn-warning btn-xs">'. \Lang::get("lang.edit") .'</a>&nbsp;<a href=article-list class="btn btn-primary btn-xs">'. \Lang::get("lang.view") .'</a>
-				<div class="modal fade" id="banemail">
+				return '<span  data-toggle="modal" data-target="#deletecategory' . $model->slug . '"><a href="#" ><button class="btn btn-danger btn-xs"></a>'. \Lang::get("lang.delete") .'</button></span>&nbsp;<a href=category/' . $model->id . '/edit class="btn btn-warning btn-xs">'. \Lang::get("lang.edit") .'</a>&nbsp;<a href=article-list class="btn btn-primary btn-xs">'. \Lang::get("lang.view") .'</a>
+				<div class="modal fade" id="deletecategory' . $model->slug . '">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
@@ -138,7 +139,7 @@ class CategoryController extends Controller {
 	 */
 	public function edit($slug, Category $category) {
 
-		$cid = $category->where('slug', $slug)->first();
+		$cid = $category->where('id', $slug)->first();
 		$id = $cid->id;
 		/* get the atributes of the category model whose id == $id */
 		$category = $category->whereId($id)->first();
@@ -153,17 +154,19 @@ class CategoryController extends Controller {
 	 * @param  int  $id
 	 * @return Response
 	 */
-	public function update($slug, Category $category, CategoryRequest $request) {
+	public function update($slug, Category $category, CategoryUpdate $request) {
 		
 		/* Edit the selected category via id */
-		$category = $category->where('slug', $slug)->first();
+		$category = $category->where('id', $slug)->first();
 		$sl = $request->input('slug');
 		$slug = str_slug($sl, "-");
-
+		// dd($slug);
 		$category->slug = $slug;
 		/* update the values at the table via model according with the request */
-		if ($category->fill($request->except('slug'))->save()) //True: redirct to index page with success message
+		if ($category->fill($request->all())->save()) //True: redirct to index page with success message
 		{
+			$category->slug = $slug;
+			$category->save();
 			return redirect('category')->with('success', 'Category Updated Successfully');
 		} else //redirect to index with fails message
 		{
@@ -178,17 +181,25 @@ class CategoryController extends Controller {
 	 * @return Response
 	 */
 	public function destroy($id, Category $category, Relationship $relation) {
-		$relation = $relation->where('category_id', $id)->delete();
-		// $relation->delete();
-		/*  delete the category selected, id == $id */
-		$category = $category->whereId($id)->first();
-		if ($category->delete()) //True: redirect to index with success message
-		{
-			return Redirect::back()->with('success', 'Category Deleted Successfully');
-		} else //redirect to index page fails message
-		{
+
+		$relation = $relation->where('category_id', $id)->first();
+		// dd($relation);
+		if($relation != null){
 			return Redirect::back()->with('fails', 'Category Not Deleted');
 		}
+		else {
+
+			/*  delete the category selected, id == $id */
+			$category = $category->whereId($id)->first();
+			if ($category->delete()) //True: redirect to index with success message
+			{
+				return Redirect::back()->with('success', 'Category Deleted Successfully');
+			} else //redirect to index page fails message
+			{
+				return Redirect::back()->with('fails', 'Category Not Deleted');
+			}
+			
+		}
 	}
 
 }
diff --git a/code/app/Http/Controllers/Agent/kb/PageController.php b/code/app/Http/Controllers/Agent/kb/PageController.php
index 7364cecf1..1e4a61660 100644
--- a/code/app/Http/Controllers/Agent/kb/PageController.php
+++ b/code/app/Http/Controllers/Agent/kb/PageController.php
@@ -1,11 +1,12 @@
 <?php namespace App\Http\Controllers\Agent\kb;
 
-use App\Http\Controllers\Client\kb\UserController;
+use App\Http\Controllers\client\kb\UserController;
 use App\Http\Controllers\Agent\kb\ArticleController;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Agent\kb\SettingsController;
 use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Requests\kb\PageRequest;
+use App\Http\Requests\kb\PageUpdate;
 use App\Model\kb\Page;
 use Datatable;
 use Illuminate\Http\Request;
@@ -56,8 +57,8 @@ class PageController extends Controller {
 			->addColumn('Actions', function ($model) {
 
 				//return '<a href=page/delete/' . $model->id . ' class="btn btn-danger btn-flat">Delete</a>&nbsp;<a href=page/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=article-list class="btn btn-warning btn-flat">View</a>';
-				return '<span  data-toggle="modal" data-target="#banemail"><a href="#" ><button class="btn btn-danger btn-xs"></a> '. \Lang::get('lang.delete') .'</button></span>&nbsp;<a href=page/' . $model->slug . '/edit class="btn btn-warning btn-xs">'. \Lang::get('lang.edit') .'</a>&nbsp;<a href=pages/' . $model->slug . ' class="btn btn-primary btn-xs">'. \Lang::get('lang.view') .'</a>
-				<div class="modal fade" id="banemail">
+				return '<span  data-toggle="modal" data-target="#deletepage' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> '. \Lang::get('lang.delete') .'</button></span>&nbsp;<a href=page/' . $model->slug . '/edit class="btn btn-warning btn-xs">'. \Lang::get('lang.edit') .'</a>&nbsp;<a href=pages/' . $model->slug . ' class="btn btn-primary btn-xs">'. \Lang::get('lang.view') .'</a>
+				<div class="modal fade" id="deletepage' . $model->id . '">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
@@ -129,14 +130,16 @@ class PageController extends Controller {
 	 * @param type Request $request
 	 * @return type
 	 */
-	public function update($slug, PageRequest $request) {
+	public function update($slug, PageUpdate $request) {
 		$pages = $this->page->where('slug', $slug)->first();
 		$sl = $request->input('slug');
 			$slug = str_slug($sl, "-");
 
 			$this->page->slug = $slug;
 		//$id = $page->id;
-		$pages->fill($request->except('slug'))->save();
+		$pages->fill($request->all())->save();
+		$pages->slug = $slug;
+		$pages->save();
 		return redirect('page')->with('success', 'Your Page Updated Successfully');
 	}
 
@@ -151,4 +154,4 @@ class PageController extends Controller {
 		return redirect('page')->with('success', 'Page Deleted Successfully');
 	}
 
-}
+}
\ No newline at end of file
diff --git a/code/app/Http/Controllers/Installer/helpdesk/InstallController.php b/code/app/Http/Controllers/Installer/helpdesk/InstallController.php
index 3ff3f68de..cc609a758 100644
--- a/code/app/Http/Controllers/Installer/helpdesk/InstallController.php
+++ b/code/app/Http/Controllers/Installer/helpdesk/InstallController.php
@@ -395,12 +395,11 @@ class InstallController extends Controller {
 				File::put($install, $datacontent);
 
 				$smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
-				$path22 = app_path('Http\routes.php');
+				$path22 = app_path('Http/routes.php');
 				$content23 = File::get($path22);
 				$content23 = str_replace('"%smtplink%"', $smtpfilepath, $content23);
 				File::put($path22, $content23);
 
-
 				try {
 					return View::make('themes/default1/installer/helpdesk/view7');
 				} catch (Exception $e) {
diff --git a/code/app/Http/Requests/kb/ArticleUpdate.php b/code/app/Http/Requests/kb/ArticleUpdate.php
new file mode 100644
index 000000000..395a1e06c
--- /dev/null
+++ b/code/app/Http/Requests/kb/ArticleUpdate.php
@@ -0,0 +1,30 @@
+<?php namespace App\Http\Requests\kb;
+
+use App\Http\Requests\Request;
+
+class ArticleUpdate extends Request {
+
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize() {
+		return true;
+	}
+
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules() {
+		return [
+			'name' => 'required',
+			'slug' => 'required',
+			'description' => 'required',
+			'category_id' => 'required',
+		];
+	}
+
+}
diff --git a/code/app/Http/Requests/kb/CategoryUpdate.php b/code/app/Http/Requests/kb/CategoryUpdate.php
new file mode 100644
index 000000000..2cde52b42
--- /dev/null
+++ b/code/app/Http/Requests/kb/CategoryUpdate.php
@@ -0,0 +1,30 @@
+<?php namespace App\Http\Requests\kb;
+
+use App\Http\Requests\Request;
+
+class CategoryUpdate extends Request {
+
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize() {
+		return true;
+	}
+
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules() {
+		return [
+			'name' => 'required',
+			'slug' => 'required',
+			'description' => 'required',
+
+		];
+	}
+
+}
diff --git a/code/app/Http/Requests/kb/PageUpdate.php b/code/app/Http/Requests/kb/PageUpdate.php
new file mode 100644
index 000000000..b40fa737b
--- /dev/null
+++ b/code/app/Http/Requests/kb/PageUpdate.php
@@ -0,0 +1,30 @@
+<?php namespace App\Http\Requests\kb;
+
+use App\Http\Requests\Request;
+
+class PageUpdate extends Request {
+
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize() {
+		return true;
+	}
+
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules() {
+		return [
+			'name' => 'required',
+			'slug' => 'required',
+			//'description' => 'required',
+
+		];
+	}
+
+}
diff --git a/code/app/Http/routes.php b/code/app/Http/routes.php
index 334c39cdc..52c76dc0c 100644
--- a/code/app/Http/routes.php
+++ b/code/app/Http/routes.php
@@ -292,7 +292,7 @@ Route::any('getdata', function() {
 
 	Route::get('/', ['as'=>'/', 'uses'=>'Client\helpdesk\WelcomepageController@index']);
 
-	Route::get('form',['as'=>'form','uses'=>'Client\helpdesk\FormController@getForm']);	//getform
+	Route::get('create-ticket',['as'=>'form','uses'=>'Client\helpdesk\FormController@getForm']);	//getform
 
 	Route::get('mytickets/{id}', ['as' => 'ticketinfo', 'uses' => 'Client\helpdesk\GuestController@singleThread']);	//detail ticket information
 
@@ -494,7 +494,7 @@ $router->get('category-list', ['as'=>'category-list' , 'uses'=> 'Client\kb\UserC
 /* get the categories with article */
 $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('knowledgebase',['as'=>'home' , 'uses'=> 'Client\kb\UserController@home']);
 /* get the faq value to user */
 $router->get('faq',['as'=>'faq' , 'uses'=>'Client\kb\UserController@Faq'] );
 /* get the cantact page to user */
diff --git a/code/config/app.php b/code/config/app.php
index 3e3d774e5..9f2bbada2 100644
--- a/code/config/app.php
+++ b/code/config/app.php
@@ -24,7 +24,7 @@ return [
 	|
 	 */
 
-	'version' => '1.0.2',
+	'version' => 'Community 1.0.2.1',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/code/config/database.php b/code/config/database.php
index db12a9b55..0f879c3dc 100644
--- a/code/config/database.php
+++ b/code/config/database.php
@@ -11,7 +11,7 @@ return [
 	| stdClass object; however, you may desire to retrieve records in an
 	| array format for simplicity. Here you can tweak the fetch style.
 	|
-	*/
+	 */
 
 	'fetch' => PDO::FETCH_CLASS,
 
@@ -24,7 +24,7 @@ return [
 	| to use as your default connection for all database work. Of course
 	| you may use many connections at once using the Database library.
 	|
-	*/
+	 */
 
 	'default' => '%default%',
 
@@ -42,46 +42,46 @@ return [
 	| so make sure you have the driver for your particular database of
 	| choice installed on your machine before you begin development.
 	|
-	*/
+	 */
 
 	'connections' => [
 
 		'sqlite' => [
-			'driver'   => 'sqlite',
-			'database' => storage_path().'/database.sqlite',
-			'prefix'   => '',
+			'driver' => 'sqlite',
+			'database' => storage_path() . '/database.sqlite',
+			'prefix' => '',
 		],
 
 		'mysql' => [
-			'driver'    => 'mysql',
-			'host'      => '%host%',
-			'database'  => '%database%',
-			'username'  => '%username%',
-			'password'  => '%password%',
-			'charset'   => 'utf8',
+			'driver' => 'mysql',
+			'host' => '%host%',
+			'database' => '%database%',
+			'username' => '%username%',
+			'password' => '%password%',
+			'charset' => 'utf8',
 			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-			'strict'    => false,
+			'prefix' => '',
+			'strict' => false,
 		],
 
 		'pgsql' => [
-			'driver'   => 'pgsql',
-			'host'     => env('DB_HOST', 'localhost'),
-			'database' => env('DB_DATABASE', 'forge'),
-			'username' => env('DB_USERNAME', 'forge'),
-			'password' => env('DB_PASSWORD', ''),
-			'charset'  => 'utf8',
-			'prefix'   => '',
-			'schema'   => 'public',
+			'driver' => 'pgsql',
+			'host' => '%host1%',
+			'database' => '%database1%',
+			'username' => '%username1%',
+			'password' => '%password1%',
+			'charset' => 'utf8',
+			'prefix' => '',
+			'schema' => 'public',
 		],
 
 		'sqlsrv' => [
-			'driver'   => 'sqlsrv',
-			'host'     => env('DB_HOST', 'localhost'),
-			'database' => env('DB_DATABASE', 'forge'),
-			'username' => env('DB_USERNAME', 'forge'),
-			'password' => env('DB_PASSWORD', ''),
-			'prefix'   => '',
+			'driver' => 'sqlsrv',
+			'host' => '%host2%',
+			'database' => '%database2%',
+			'username' => '%username2%',
+			'password' => '%password2%',
+			'prefix' => '',
 		],
 
 	],
@@ -95,10 +95,22 @@ return [
 	| your application. Using this information, we can determine which of
 	| the migrations on disk haven't actually been run in the database.
 	|
-	*/
+	 */
 
 	'migrations' => 'migrations',
 
+	/*
+	|--------------------------------------------------------------------------
+	| Installer value
+	|--------------------------------------------------------------------------
+	|
+	| This key is used for the installer to know wether this project is
+	| installed or not.
+	|
+	 */
+
+	'install' => '%0%',
+
 	/*
 	|--------------------------------------------------------------------------
 	| Redis Databases
@@ -108,17 +120,15 @@ return [
 	| provides a richer set of commands than a typical key-value systems
 	| such as APC or Memcached. Laravel makes it easy to dig right in.
 	|
-	*/
-	'install' => '%0%',
-
+	 */
 
 	'redis' => [
 
 		'cluster' => false,
 
 		'default' => [
-			'host'     => '127.0.0.1',
-			'port'     => 6379,
+			'host' => '127.0.0.1',
+			'port' => 6379,
 			'database' => 0,
 		],
 
diff --git a/code/database/migrations/2015_05_01_100249_create_categories_table.php b/code/database/migrations/2015_05_01_100249_create_categories_table.php
index 77c9b18f0..ff2da12fa 100644
--- a/code/database/migrations/2015_05_01_100249_create_categories_table.php
+++ b/code/database/migrations/2015_05_01_100249_create_categories_table.php
@@ -15,7 +15,7 @@ class CreateCategoriesTable extends Migration {
 			$table->increments('id')->unsigned();
 			$table->string('name');
 			$table->string('slug');
-			$table->string('description');
+			$table->mediumText('description');
 			$table->boolean('status');
 			$table->integer('parent');
 			$table->timestamps();
diff --git a/code/database/migrations/2015_05_01_114710_create_articles_table.php b/code/database/migrations/2015_05_01_114710_create_articles_table.php
index 95c76a92d..acad55a23 100644
--- a/code/database/migrations/2015_05_01_114710_create_articles_table.php
+++ b/code/database/migrations/2015_05_01_114710_create_articles_table.php
@@ -15,7 +15,7 @@ class CreateArticlesTable extends Migration {
 			$table->increments('id')->unsigned();
 			$table->string('name');
 			$table->string('slug');
-			$table->text('description');
+			$table->longText('description');
 			$table->boolean('status');
 			$table->boolean('type');
 			$table->timestamps();
diff --git a/code/database/migrations/2015_05_06_060231_create_contacts_table.php b/code/database/migrations/2015_05_06_060231_create_contacts_table.php
index 477a16357..e212f423f 100644
--- a/code/database/migrations/2015_05_06_060231_create_contacts_table.php
+++ b/code/database/migrations/2015_05_06_060231_create_contacts_table.php
@@ -16,7 +16,7 @@ class CreateContactsTable extends Migration {
 			$table->string('name');
 			$table->string('email');
 			$table->string('subject');
-			$table->string('message');
+			$table->mediumText('message');
 			$table->timestamps();
 		});
 	}
diff --git a/code/database/migrations/2015_05_14_072226_create_pages_table.php b/code/database/migrations/2015_05_14_072226_create_pages_table.php
index 3c5f25a4b..7f3e06001 100644
--- a/code/database/migrations/2015_05_14_072226_create_pages_table.php
+++ b/code/database/migrations/2015_05_14_072226_create_pages_table.php
@@ -17,7 +17,7 @@ class CreatePagesTable extends Migration {
 			$table->boolean('status');
 			$table->boolean('visibility');
 			$table->string('slug');
-			$table->text('description');
+			$table->longText('description');
 			$table->timestamps();
 		});
 	}
diff --git a/code/database/migrations/2015_10_09_105525_create_canned_response_table.php b/code/database/migrations/2015_10_09_105525_create_canned_response_table.php
index 9495136a6..30d6e605f 100644
--- a/code/database/migrations/2015_10_09_105525_create_canned_response_table.php
+++ b/code/database/migrations/2015_10_09_105525_create_canned_response_table.php
@@ -15,7 +15,7 @@ class CreateCannedResponseTable extends Migration {
 			$table->increments('id');
 			$table->integer('user_id');
 			$table->string('title');
-			$table->string('message');
+			$table->longText('message');
 			$table->timestamps();
 		});
 	}
diff --git a/code/database/migrations/2015_11_02_063848_create_side_table.php b/code/database/migrations/2015_11_02_063848_create_side_table.php
index 4aa3ff360..977b68f79 100644
--- a/code/database/migrations/2015_11_02_063848_create_side_table.php
+++ b/code/database/migrations/2015_11_02_063848_create_side_table.php
@@ -15,13 +15,13 @@ class CreateSideTable extends Migration {
 		Schema::create('side1', function (Blueprint $table) {
 			$table->increments('id');
 			$table->string('title');
-			$table->string('content');
+			$table->mediumText('content');
 			$table->timestamps();
 		});
 		Schema::create('side2', function (Blueprint $table) {
 			$table->increments('id');
 			$table->string('title');
-			$table->string('content');
+			$table->mediumText('content');
 			$table->timestamps();
 		});
 	}
diff --git a/code/resources/lang/en/lang.php b/code/resources/lang/en/lang.php
index 59e5b1e4f..dc9339540 100644
--- a/code/resources/lang/en/lang.php
+++ b/code/resources/lang/en/lang.php
@@ -506,23 +506,23 @@ return array(
       |  Group Create Page
       |--------------------------------------
       */
-      	'create_group'			=>'Create Group',
-      	'goups'					=>'Goups',
-		'can_create_ticket'		=>'Can create ticket',	
-		'can_edit_ticket'		=>'Can edit ticket',	
-		'can_post_ticket'		=>'Can post Ticket',	
-		'can_close_ticket'		=>'Can close ticket ',	
-		'can_assign_ticket'		=>'Can assign ticket',	
-		'can_transfer_ticket'	=>'Can transfer ticket',	
-		'can_delete_ticket'		=>'Can delete ticket',	
-		'can_ban_emails'		=>'Can ban emails',	
-		'can_manage_premade'	=>'Can Manage premade',	
-		'can_manage_FAQ'		=>'Can manage FAQ',	
-		'can_view_agent_stats'	=>'Can view agent stats',	
-		'department_access'		=>'Department Access ',
-		'admin_notes'			=>'Admin Notes',
-		'group_members'			=>'Group Members',
-		'group_name'			=>'Group Name',
+      'create_group'			=>'Create Group',
+    	'goups'					=>'Goups',
+		  'can_create_ticket'		=>'Can create ticket',	
+		  'can_edit_ticket'		=>'Can edit ticket',	
+		  'can_post_ticket'		=>'Can post Ticket',	
+		  'can_close_ticket'		=>'Can close ticket ',	
+  		'can_assign_ticket'		=>'Can assign ticket',	
+		  'can_transfer_ticket'	=>'Can transfer ticket',	
+		  'can_delete_ticket'		=>'Can delete ticket',	
+		  'can_ban_emails'		=>'Can ban emails',	
+		  'can_manage_premade'	=>'Can Manage premade',	
+		  'can_manage_FAQ'		=>'Can manage FAQ',	
+		  'can_view_agent_stats'	=>'Can view agent stats',	
+		  'department_access'		=>'Department Access ',
+		  'admin_notes'			=>'Admin Notes',
+		  'group_members'			=>'Group Members',
+		  'group_name'			=>'Group Name',
 
 
      /*
@@ -686,6 +686,7 @@ return array(
        'user_details'     =>    'User Details',
        'ticket_option'    =>    'Ticket Option',
        'ticket_detail'    =>    'Ticket Detail',
+       'Assigned_To'      =>    'ASSIGNED TO',
 
 
     /*
@@ -820,7 +821,6 @@ return array(
    'check_ticket_status'  =>  'Check Ticket status',
    'choose_a_help_topic'    =>    'Choose a Help Topic',
    'ticket_status'    =>    'Ticket Status',
-   
-
+   'post_comment'   =>    'Post Comment',
 
     );
\ No newline at end of file
diff --git a/code/resources/views/auth/reset.blade.php b/code/resources/views/auth/reset.blade.php
index 992e04144..22d74770f 100644
--- a/code/resources/views/auth/reset.blade.php
+++ b/code/resources/views/auth/reset.blade.php
@@ -28,13 +28,13 @@
                         </div>
                         <!-- password -->
                         <div class="form-group has-feedback {{ $errors->has('password') ? 'has-error' : '' }}">
-                                <input type="password" class="form-control" name="password" placeholder="Lang::get('lang.password')">
+                                <input type="password" class="form-control" name="password" placeholder="{!! Lang::get('lang.password') !!}">
                                 {!! $errors->first('password', '<spam class="help-block">:message</spam>') !!}
                                 <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                         </div>
                         <!-- confirm password -->
                         <div class="form-group has-feedback {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
-                                <input type="password" class="form-control" name="password_confirmation" placeholder="Lang::get('lang.confirm_password')">
+                                <input type="password" class="form-control" name="password_confirmation" placeholder="{!! Lang::get('lang.confirm_password') !!}">
                                 {!! $errors->first('password_confirmation', '<spam class="help-block">:message</spam>') !!}
                                 <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
                         </div>
diff --git a/code/resources/views/emails/Ticket_Create.blade.php b/code/resources/views/emails/Ticket_Create.blade.php
index 9cec819a5..f2b6f058c 100644
--- a/code/resources/views/emails/Ticket_Create.blade.php
+++ b/code/resources/views/emails/Ticket_Create.blade.php
@@ -5,7 +5,7 @@ if(isset($content)) {
 ?>
 
 <h4 style="background-color:#F3F3F3;padding:20px;border:1px;border-radius:7px;">{!! $content !!}<br/><br/>{!! $sign !!}</h4>
-You can check the status of or update this ticket online at: {!! \URL::route('ticket2') !!}<br/><br/>
+You can check the status of or update this ticket online at: <a href="{!! \URL::route('ticket2') !!}">{!! \URL::route('ticket2') !!}</a><br/><br/>
 
 <?php 
 } else { 
@@ -19,7 +19,7 @@ Ticket ID: <b>{!!$ticket_number!!}</b><br/>
 {{-- Status: <b>Open</b><br/> --}}
 {{-- Priority: <b>Normal</b><br/><br/> --}}
 {!! $sign !!}
-You can check the status of or update this ticket online at: {!! \URL::route('ticket2') !!}<br/><br/>
+You can check the status of or update this ticket online at: <a href="{!! \URL::route('ticket2') !!}">{!! \URL::route('ticket2') !!}</a><br/><br/>
 Thank You.<br/><br/>
 Kind Regards,<br/><br/>
 {!! $sign !!}
diff --git a/code/resources/views/emails/check_ticket.blade.php b/code/resources/views/emails/check_ticket.blade.php
index 1130cac1e..4133e7014 100644
--- a/code/resources/views/emails/check_ticket.blade.php
+++ b/code/resources/views/emails/check_ticket.blade.php
@@ -2,7 +2,7 @@ Hello {!! $user !!},<br/><br/>
 
 
 Click the link below to view your Requested ticket <br/><br/>
-{!! $link !!}<br/><br/>
+<a href="{!! $link !!}">{!! $link !!}</a><br/><br/>
 
 
 Kind Regards,<br/>
diff --git a/code/resources/views/emails/pass.blade.php b/code/resources/views/emails/pass.blade.php
index fc2266abe..8bc12a322 100644
--- a/code/resources/views/emails/pass.blade.php
+++ b/code/resources/views/emails/pass.blade.php
@@ -5,10 +5,10 @@ This email is confirmation that you are now registered at our helpdesk. <br/> <b
 Registered Email: {!! $emailadd !!} <br/>
 Password: {{$password}} <br/> <br/> 
 
-You can visit the helpdesk to browse articles and contact us at any time: {!! \URL::route('ticket2') !!}<br/> <br/> 
+You can visit the helpdesk to browse articles and contact us at any time: <a href="{!! \URL::route('ticket2') !!}">{!! \URL::route('ticket2') !!}</a><br/> <br/> 
 
 Thank You.<br/><br/> 
 
 Kind Regards,<br/><br/>
 
-{!! $from !!}
+{!! $from !!}
\ No newline at end of file
diff --git a/code/resources/views/emails/password.blade.php b/code/resources/views/emails/password.blade.php
index c313c7589..71ce09054 100644
--- a/code/resources/views/emails/password.blade.php
+++ b/code/resources/views/emails/password.blade.php
@@ -2,7 +2,7 @@ Hello <br/><br/>
 
 You asked to reset your password. To do so, please click this link:<br/><br/>
 
-	{!! url('password/reset/'.$token) !!}    <br/><br/>
+<a href="{!! url('password/reset/'.$token) !!}">{!! url('password/reset/'.$token) !!}</a><br/><br/>
 
 <br/>
 This will let you change your password to something new. If you didn't ask for this, don't worry, we'll keep your password safe.<br/><br/>
diff --git a/code/resources/views/themes/default1/agent/kb/article/create.blade.php b/code/resources/views/themes/default1/agent/kb/article/create.blade.php
index 6649e5791..51a7b8281 100644
--- a/code/resources/views/themes/default1/agent/kb/article/create.blade.php
+++ b/code/resources/views/themes/default1/agent/kb/article/create.blade.php
@@ -135,7 +135,7 @@
 					<div class="row">
 						<div class="form-group">
 							<div class="col-md-1">
-								<input type="checkbox" name="category_id[]" value="<?php echo $val;?>">
+								<input type="radio" name="category_id[]" value="<?php echo $val;?>">
 							</div>
 							<div class="col-md-10">
 								<?php echo $key;?>
diff --git a/code/resources/views/themes/default1/agent/kb/article/edit.blade.php b/code/resources/views/themes/default1/agent/kb/article/edit.blade.php
index 1d9af2309..8f68b6b74 100644
--- a/code/resources/views/themes/default1/agent/kb/article/edit.blade.php
+++ b/code/resources/views/themes/default1/agent/kb/article/edit.blade.php
@@ -7,7 +7,7 @@
     class="active"
 @stop
 @section('content')
-{!! Form::model($article,['url' => 'article/'.$article->slug , 'method' => 'PATCH'] )!!}
+{!! Form::model($article,['url' => 'article/'.$article->id , 'method' => 'PATCH'] )!!}
 <div class="row">
 		<div class="box-body" >
 		@if(Session::has('success'))
@@ -117,7 +117,7 @@
 			<div class="row">
 						<div class="form-group">
 							<div class="col-md-1">
-			<input type="checkbox" name="category_id[]" value="<?php echo $val;?>" <?php if (in_array($val, $assign)) {
+			<input type="radio" name="category_id[]" value="<?php echo $val;?>" <?php if (in_array($val, $assign)) {
 	echo ('checked');
 }
 ?> ></div>
diff --git a/code/resources/views/themes/default1/agent/kb/category/edit.blade.php b/code/resources/views/themes/default1/agent/kb/category/edit.blade.php
index b7ecad122..55cb48024 100644
--- a/code/resources/views/themes/default1/agent/kb/category/edit.blade.php
+++ b/code/resources/views/themes/default1/agent/kb/category/edit.blade.php
@@ -11,7 +11,7 @@
 </script>
 
 @section('content')
-{!! Form::model($category,['url' => 'category/'.$category->slug , 'method' => 'PATCH'] )!!}
+{!! Form::model($category,['url' => 'category/'.$category->id , 'method' => 'PATCH'] )!!}
 
 
 <div class="box box-primary">
diff --git a/code/resources/views/themes/default1/agent/layout/agent.blade.php b/code/resources/views/themes/default1/agent/layout/agent.blade.php
index a0137792a..05e544214 100644
--- a/code/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/code/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -263,7 +263,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('name', '=', $agent_group)->wher
                                         </div>
                                         <div class="tabs-pane @yield('tools-bar')" id="tabD">
                                             <ul class="nav navbar-nav">
-                                                <li id="bar" @yield('tools')><a href="{{ url('/canned/list') }}" >{!! Lang::get('lang.canned') !!}</a></li>
+                                                <li id="bar" @yield('tools')><a href="{{ url('/canned/list') }}" >{!! Lang::get('lang.canned_response') !!}</a></li>
                                                 <li id="bar" @yield('kb')><a href="{{ url('/comment') }}" >{!! Lang::get('lang.knowledge_base') !!}</a></li>
                                             </ul>
                                         </div>
diff --git a/code/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php b/code/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
index 10324aca3..ccda9235d 100644
--- a/code/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
+++ b/code/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
@@ -95,21 +95,21 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id','=',\Crypt:
                                             <tr><td><b>{!! Lang::get('lang.status') !!}:</b></td>       <?php $status = App\Model\helpdesk\Ticket\Ticket_Status::where('id','=',$tickets->status)->first();?>
 
                                             @if($status->id == 1)
-                                                <td title="{{$status->properties}}" style="color:orange">{{$status->state}}</td></tr>
+                                                <td title="{{$status->properties}}" style="color:orange">{{$status->name}}</td></tr>
                                             @elseif($status->id == 2)
-                                                <td title="{{$status->properties}}" style="color:green">{{$status->state}}</td></tr>
+                                                <td title="{{$status->properties}}" style="color:green">{{$status->name}}</td></tr>
                                             @elseif($status->id == 3)
-                                                <td title="{{$status->properties}}" style="color:green">{{$status->state}}</td></tr>
+                                                <td title="{{$status->properties}}" style="color:green">{{$status->name}}</td></tr>
                                             @endif
 
                                             <tr><td><b>{!! Lang::get('lang.priority') !!}:</b></td>     <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id','=',$tickets->priority_id)->first();?>
 
                                             @if($priority->priority_id == 1)
-                                                <td title="{{$priority->priority_desc}}" style="color:green">{{$priority->priority}}</td>
+                                                <td title="{{$priority->priority_desc}}" style="color:green">{{$priority->priority_desc}}</td>
                                             @elseif($priority->priority_id == 2)
-                                                <td title="{{$priority->priority_desc}}" style="color:orange">{{$priority->priority}}</td>
+                                                <td title="{{$priority->priority_desc}}" style="color:orange">{{$priority->priority_desc}}</td>
                                             @elseif($priority->priority_id == 3)
-                                                <td title="{{$priority->priority_desc}}" style="color:red">{{$priority->priority}}</td>
+                                                <td title="{{$priority->priority_desc}}" style="color:red">{{$priority->priority_desc}}</td>
                                             @endif
 
                                             </tr>
@@ -127,7 +127,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id','=',\Crypt:
                                         <table class="table table-hover">
                                             <!-- <tr><th></th><th></th></tr> -->
                                             <tr><td><b>{!! Lang::get('lang.help_topic') !!}:</b></td>     <?php $help_topic = App\Model\helpdesk\Manage\Help_topic::where('id','=',$tickets->help_topic_id)->first();?><td title="{{$help_topic->topic}}">{{$help_topic->topic}}</td></tr>
-                                            <tr><td><b>{!! Lang::get('lang.last_message') !!}:</b></td>   <td>{{$last->poster}}</td></tr>
+                                            <tr><td><b>{!! Lang::get('lang.last_message') !!}:</b></td>   <td>{{ucwords($last->poster)}}</td></tr>
                                         </table>
                                     </div>
                                     <!-- </div> -->
@@ -219,7 +219,6 @@ $data = $ConvDate[0];
                                                         @else
                                                             <img src="{{ Gravatar::src($role->email) }}" alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
                                                         @endif
-                                                        <span class="hidden-xs">{{Auth::user()->first_name." ".Auth::user()->last_name}}</span>
                                                     @if($role->role == "user")
                                                         <b class="fn"><a href="#" rel="external" class="url">{{$role->user_name}}</a></b>
                                                     @else
diff --git a/code/resources/views/themes/default1/client/helpdesk/form.blade.php b/code/resources/views/themes/default1/client/helpdesk/form.blade.php
index 44d0d680b..20437344a 100644
--- a/code/resources/views/themes/default1/client/helpdesk/form.blade.php
+++ b/code/resources/views/themes/default1/client/helpdesk/form.blade.php
@@ -1,5 +1,9 @@
 @extends('themes.default1.client.layout.client')
 
+@section('title')
+    Submit A Ticket -
+@stop
+
 @section('submit')
     class = "active"
 @stop
diff --git a/code/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php b/code/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
index 46277ba63..75fa9298b 100644
--- a/code/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
+++ b/code/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
@@ -1,4 +1,9 @@
 @extends('themes.default1.client.layout.client')
+
+@section('home')
+    class = "active"
+@stop
+
 @section('HeadInclude')
 <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
            <link href="{{asset("lb-faveo/dist/css/widgetbox.css")}}" rel="stylesheet" type="text/css" />
@@ -11,7 +16,7 @@
 	<div class="site-hero clearfix">
                                     <ol class="breadcrumb breadcrumb-custom">
                                             <li class="text">{!! Lang::get('lang.you_are_here') !!}: </li>
-                                            <li><a href="{!! URL::route('home') !!}">{!! Lang::get('lang.home') !!}</a></li>
+                                            <li><a href="{!! URL::route('/') !!}">{!! Lang::get('lang.home') !!}</a></li>
                                     </ol>
                    </div>
 @stop
@@ -29,7 +34,7 @@
         @endif
         @if(App\Model\helpdesk\Settings\System::first()->status == 1)
             <span onclick="javascript: window.location.href='https://support.ebs.in/app/index.php?/Tickets/Submit';">
-                <a href="{{url('form')}}" class="widgetrowitem defaultwidget" style="background-image: URL('https://support.ebs.in/app/__swift/themes/client/images/icon_widget_submitticket.png');">
+                <a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image: URL('https://support.ebs.in/app/__swift/themes/client/images/icon_widget_submitticket.png');">
                     <span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
                 </a>
             </span>
@@ -39,6 +44,11 @@
                     <span class="widgetitemtitle">{!! Lang::get('lang.my_tickets') !!}</span>
                 </a>
             </span>
+            <span onclick="javascript: window.location.href='https://support.ebs.in/app/index.php?/News/List';">
+                <a href="{{url('/knowledgebase')}}" class="widgetrowitem defaultwidget" style="background-image: URL('https://support.ebs.in/app/__swift/themes/client/images/icon_widget_knowledgebase.png');">
+                    <span class="widgetitemtitle">{!! Lang::get('lang.knowledge_base') !!}</span>
+                </a>
+            </span>
         </div>
     </div>
 <script type="text/javascript"> $(function(){ $('.dialogerror, .dialoginfo, .dialogalert').fadeIn('slow');$("form").bind("submit", function(e){$(this).find("input:submit").attr("disabled", "disabled");});});</script>
diff --git a/code/resources/views/themes/default1/client/helpdesk/mytickets.blade.php b/code/resources/views/themes/default1/client/helpdesk/mytickets.blade.php
index 7c2df712c..2030f13da 100644
--- a/code/resources/views/themes/default1/client/helpdesk/mytickets.blade.php
+++ b/code/resources/views/themes/default1/client/helpdesk/mytickets.blade.php
@@ -1,5 +1,9 @@
 @extends('themes.default1.client.layout.client')
 
+@section('title')
+    My Tickets -
+@stop
+
 @section('breadcrumb')
 
     <div class="site-hero clearfix">               
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 afc67c206..629b6478c 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
@@ -1,5 +1,9 @@
 @extends('themes.default1.client.layout.client')
 
+@section('title')
+    Article List -
+@stop
+
 @section('kb')
     class = "active"
 @stop
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 d460fb8df..3c4e24506 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
@@ -1,5 +1,9 @@
 @extends('themes.default1.client.layout.client')
 
+@section('title')
+    All Category -
+@stop
+
 @section('kb')
     class = "active"
 @stop
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 13da5d3bf..6dd9ceccc 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
@@ -1,5 +1,9 @@
 @extends('themes.default1.client.layout.client')
 
+@section('title')
+    Category List -
+@stop
+
 @section('kb')
     class = "active"
 @stop
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 f1546f5f6..ada500d53 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
@@ -1,5 +1,10 @@
 @extends('themes.default1.client.layout.client')
-@section('home')
+
+@section('title')
+    Knowledge Base -
+@stop
+
+@section('knowledgebase')
     class = "active"
 @stop
 @section('content')
@@ -26,7 +31,7 @@
     <div class="container">
         <ol class="breadcrumb breadcrumb-custom">
             <li class="text">{!! Lang::get('lang.you_are_here') !!}: </li>
-            <li class="active">{!! Lang::get('lang.home') !!}</li>
+            <li class="active">{!! Lang::get('lang.knowledge_base') !!}</li>
         </ol>
     </div>
 </div>
@@ -83,7 +88,7 @@
             <div class="banner-content">
                 <p>{!! Lang::get('lang.if_you_did_not_find_an_answer_please_raise_a_ticket_describing_the_issue') !!}.</p>
             </div>
-            <p><a href="{{url('form')}}" class="btn btn-custom">{!! Lang::get('lang.submit_a_ticket') !!}</a></p>
+            <p><a href="{!! URL::route('form') !!}" class="btn btn-custom">{!! Lang::get('lang.submit_a_ticket') !!}</a></p>
         </div>
     </section>
 </div>
diff --git a/code/resources/views/themes/default1/client/kb/article-list/show.blade.php b/code/resources/views/themes/default1/client/kb/article-list/show.blade.php
index 7bd895e92..e261e656f 100644
--- a/code/resources/views/themes/default1/client/kb/article-list/show.blade.php
+++ b/code/resources/views/themes/default1/client/kb/article-list/show.blade.php
@@ -13,6 +13,8 @@ $category_id = $all->lists('category_id');
     <ol class="breadcrumb breadcrumb-custom">
         <li class="text">{!! Lang::get('lang.you_are_here') !!}: </li>
         <?php $category = App\Model\kb\Category::where('id', $category_id)->first(); ?>
+        <li><a href="{{url('/')}}">{!! Lang::get('lang.home') !!}</a></li>
+        <li><a href="{{url('category-list')}}">{!! Lang::get('lang.allcategory') !!}</a></li>
         <li><a href="{{url('category-list/'.$category->slug)}}">{{$category->name}}</a></li>
         <li class="active">{{$arti->name}}</li>
     </ol>
@@ -20,10 +22,8 @@ $category_id = $all->lists('category_id');
 @stop		
 @section('content')
 <div id="content" class="site-content col-md-12">
-
     <!--
     <article class=" type-post format-standard hentry clearfix">
-    
                     <h1 class="post-title"><a href="#">{{$arti->name}}</a></h1>
     
                                     <div class="post-meta clearfix">
@@ -32,7 +32,6 @@ $category_id = $all->lists('category_id');
                     </div> end of post meta 
                     {!!$arti->description!!}
     </article>-->
-
     <article class="hentry">
         <header class="entry-header">
             <h1 class="entry-title">{{$arti->name}}</h1>
@@ -129,3 +128,8 @@ $category_id = $all->lists('category_id');
 
 @stop
 
+@section('title')
+    @if(isset($category->name))
+        {!! $category->name !!} -
+    @endif
+@stop
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 2f42b645b..b6e44e483 100644
--- a/code/resources/views/themes/default1/client/layout/client.blade.php
+++ b/code/resources/views/themes/default1/client/layout/client.blade.php
@@ -2,7 +2,15 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <title> SUPPORT CENTER | CLIENT PANEL</title>
+        <?php  
+        $title = App\Model\helpdesk\Settings\System::where('id','=','1')->first();
+        if(isset($title->name)){
+        	$title_name = $title->name;	
+        } else {
+        	$title_name = "SUPPORT CENTER";	
+        }
+        ?>
+        <title> @yield('title') {!! $title_name !!} </title>
         <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
         <!-- Bootstrap 3.3.2 -->
         <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
@@ -54,11 +62,11 @@
 				<div id="navbar" class="navbar-wrapper text-center">
 					<nav class="navbar navbar-default site-navigation" role="navigation">
 						<ul class="nav navbar-nav navbar-menu">
-							<li @yield('home')><a href="{{url('home')}}">{!! Lang::get('lang.home') !!}</a></li>
+							<li @yield('home')><a href="{{url('/')}}">{!! Lang::get('lang.home') !!}</a></li>
 							@if($system->first()->status == 1)
 								<li @yield('submit')><a href="{{URL::route('form')}}">{!! Lang::get('lang.submit_a_ticket') !!}</a></li>
 							@endif
-							<li @yield('kb')><a href="#">{!! Lang::get('lang.knowledge_base') !!}</a>
+							<li @yield('kb')><a href="{!! url('knowledgebase') !!}">{!! Lang::get('lang.knowledge_base') !!}</a>
                                 <ul class="dropdown-menu">
                                 	<li><a href="{{route('category-list')}}">{!! Lang::get('lang.categories') !!}</a></li>  
                                     <li><a href="{{route('article-list')}}">{!! Lang::get('lang.articles') !!}</a></li>  
@@ -126,7 +134,7 @@
 					          	</div>
 								<ul class="list-unstyled pull-left">
 									<li><a href="{{url('password/email')}}">{!! Lang::get('lang.forgot_password') !!}</a><br></li>
-									<li><a href="#">{!! Lang::get('lang.create_account') !!}</a></li>
+									<li><a href="{{url('auth/register')}}">{!! Lang::get('lang.create_account') !!}</a></li>
 								</ul>
 								<button type="submit" class="btn btn-custom pull-right">{!! Lang::get('lang.login') !!}</button>
 							{!! Form::close() !!}
diff --git a/lb-faveo/Img/Ladybird.png b/lb-faveo/Img/Ladybird.png
deleted file mode 100644
index ce638c876..000000000
Binary files a/lb-faveo/Img/Ladybird.png and /dev/null differ
diff --git a/lb-faveo/Img/icon/faveokb.png b/lb-faveo/Img/icon/faveokb.png
deleted file mode 100644
index dcffcbc26..000000000
Binary files a/lb-faveo/Img/icon/faveokb.png and /dev/null differ
diff --git a/lb-faveo/dist/images/knowledgebase.png b/lb-faveo/dist/images/knowledgebase.png
new file mode 100644
index 000000000..fdc63ad27
Binary files /dev/null and b/lb-faveo/dist/images/knowledgebase.png differ
diff --git a/lb-faveo/dist/images/news.png b/lb-faveo/dist/images/news.png
new file mode 100644
index 000000000..b8359b488
Binary files /dev/null and b/lb-faveo/dist/images/news.png differ
diff --git a/lb-faveo/dist/images/submitticket.png b/lb-faveo/dist/images/submitticket.png
new file mode 100644
index 000000000..6ab8c1821
Binary files /dev/null and b/lb-faveo/dist/images/submitticket.png differ
diff --git a/lb-faveo/dist/img/ladybird.ico b/lb-faveo/dist/img/ladybird.ico
deleted file mode 100644
index fed22e210..000000000
Binary files a/lb-faveo/dist/img/ladybird.ico and /dev/null differ
diff --git a/lb-faveo/dist/img/ladybird.png b/lb-faveo/dist/img/ladybird.png
deleted file mode 100644
index f99447839..000000000
Binary files a/lb-faveo/dist/img/ladybird.png and /dev/null differ