diff --git a/app/Http/Controllers/ExpenseCategoryController.php b/app/Http/Controllers/ExpenseCategoryController.php
index fdea57cbe8e0..ebee16df7c89 100644
--- a/app/Http/Controllers/ExpenseCategoryController.php
+++ b/app/Http/Controllers/ExpenseCategoryController.php
@@ -74,7 +74,7 @@ class ExpenseCategoryController extends BaseController
 
         Session::flash('message', trans('texts.created_expense_category'));
 
-        return redirect()->to('/expense_categories');
+        return redirect()->to($category->getRoute());
     }
 
     public function update(UpdateExpenseCategoryRequest $request)
diff --git a/app/Http/routes.php b/app/Http/routes.php
index be38aabedf30..b6d57a2e86c5 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -136,7 +136,7 @@ Route::group(['middleware' => 'auth:user'], function() {
 
     Route::resource('tasks', 'TaskController');
     Route::get('api/tasks/{client_id?}', 'TaskController@getDatatable');
-    Route::get('tasks/create/{client_id?}', 'TaskController@create');
+    Route::get('tasks/create/{client_id?}/{project_id?}', 'TaskController@create');
     Route::post('tasks/bulk', 'TaskController@bulk');
     Route::get('projects', 'ProjectController@index');
     Route::get('api/projects', 'ProjectController@getDatatable');
@@ -203,7 +203,7 @@ Route::group(['middleware' => 'auth:user'], function() {
 
     // Expense
     Route::resource('expenses', 'ExpenseController');
-    Route::get('expenses/create/{vendor_id?}/{client_id?}', 'ExpenseController@create');
+    Route::get('expenses/create/{vendor_id?}/{client_id?}/{category_id?}', 'ExpenseController@create');
     Route::get('api/expenses', 'ExpenseController@getDatatable');
     Route::get('api/expenses/{id}', 'ExpenseController@getDatatableVendor');
     Route::post('expenses/bulk', 'ExpenseController@bulk');
diff --git a/resources/views/expense_categories/edit.blade.php b/resources/views/expense_categories/edit.blade.php
index 5d40753f134c..ee79b99cbbb9 100644
--- a/resources/views/expense_categories/edit.blade.php
+++ b/resources/views/expense_categories/edit.blade.php
@@ -38,6 +38,11 @@
 	<center class="buttons">
         {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(url('/expense_categories'))->appendIcon(Icon::create('remove-circle')) !!}
         {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
+		@if ($category && Auth::user()->can('create', ENTITY_EXPENSE))
+	    	{!! Button::primary(trans('texts.new_expense'))->large()
+					->asLinkTo(url("/expenses/create/0/0/{$category->public_id}"))
+					->appendIcon(Icon::create('plus-sign')) !!}
+		@endif
 	</center>
 
 	{!! Former::close() !!}
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index 0fae1de1cd16..62f68e5ed28b 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -50,6 +50,11 @@
 	<center class="buttons">
         {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(url('/expense_categories'))->appendIcon(Icon::create('remove-circle')) !!}
         {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
+		@if ($project && Auth::user()->can('create', ENTITY_TASK))
+	    	{!! Button::primary(trans('texts.new_task'))->large()
+					->asLinkTo(url("/tasks/create/{$project->client->public_id}/{$project->public_id}"))
+					->appendIcon(Icon::create('plus-sign')) !!}
+		@endif
 	</center>
 
 	{!! Former::close() !!}