diff --git a/resources/views/expense_categories/edit.blade.php b/resources/views/expense_categories/edit.blade.php
index ee79b99cbbb9..91ce7dd00e52 100644
--- a/resources/views/expense_categories/edit.blade.php
+++ b/resources/views/expense_categories/edit.blade.php
@@ -36,7 +36,7 @@
 
 
 	<center class="buttons">
-        {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(url('/expense_categories'))->appendIcon(Icon::create('remove-circle')) !!}
+        {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(HTMLUtils::previousUrl('/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()
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 9b79e907ce5c..051e43699bc2 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -50,10 +50,43 @@
         class="form-control pull-left" placeholder="{{ trans('texts.filter') }}" value="{{ Input::get('filter') }}"/>
 
     @if ($entityType == ENTITY_EXPENSE)
-		{!! Button::normal(trans('texts.recurring'))->asLinkTo(URL::to('/recurring_expenses'))->appendIcon(Icon::create('list')) !!}
-		{!! Button::normal(trans('texts.categories'))->asLinkTo(URL::to('/expense_categories'))->appendIcon(Icon::create('list')) !!}
+		{!! DropdownButton::normal(trans('texts.recurring'))
+			->withAttributes(['class'=>'recurringDropdown'])
+			->withContents([
+			  ['label' => trans('texts.new_recurring_expense'), 'url' => url('/recurring_expenses/create')],
+			]
+		  )->split() !!}
+	    {!! DropdownButton::normal(trans('texts.categories'))
+			->withAttributes(['class'=>'categoriesDropdown'])
+			->withContents([
+			  ['label' => trans('texts.new_expense_category'), 'url' => url('/expense_categories/create')],
+			]
+		  )->split() !!}
+	  	<script type="text/javascript">
+		  	$(function() {
+				$('.recurringDropdown:not(.dropdown-toggle)').click(function() {
+		  			window.location = '{{ url('/recurring_expenses') }}';
+		  		});
+				$('.categoriesDropdown:not(.dropdown-toggle)').click(function() {
+		  			window.location = '{{ url('/expense_categories') }}';
+		  		});
+			});
+		</script>
+
 	@elseif ($entityType == ENTITY_TASK)
-		{!! Button::normal(trans('texts.projects'))->asLinkTo(URL::to('/projects'))->appendIcon(Icon::create('list')) !!}
+		{!! DropdownButton::normal(trans('texts.projects'))
+			->withAttributes(['class'=>'projectsDropdown'])
+			->withContents([
+			  ['label' => trans('texts.new_project'), 'url' => url('/projects/create')],
+			]
+		  )->split() !!}
+	  	<script type="text/javascript">
+		  	$(function() {
+		  		$('.projectsDropdown:not(.dropdown-toggle)').click(function() {
+		  			window.location = '{{ url('projects') }}';
+		  		});
+			});
+		</script>
     @endif
 
 	@if (Auth::user()->can('create', $entityType) && empty($vendorId))
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index bb9eaebecd70..e30b119ca0f7 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -48,7 +48,7 @@
 
 
 	<center class="buttons">
-        {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(url('/projects'))->appendIcon(Icon::create('remove-circle')) !!}
+        {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(HTMLUtils::previousUrl('/projects'))->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()