diff --git a/app/controllers/LimitController.php b/app/controllers/LimitController.php
index 3555366405..824207fdfa 100644
--- a/app/controllers/LimitController.php
+++ b/app/controllers/LimitController.php
@@ -22,6 +22,9 @@ class LimitController extends BaseController
     {
         $this->_budgets = $budgets;
         $this->_limits  = $limits;
+
+        View::share('title','Envelopes');
+        View::share('mainTitleIcon', 'fa-tasks');
     }
 
     /**
@@ -42,7 +45,7 @@ class LimitController extends BaseController
 
         return View::make('limits.create')->with('budgets', $budgets)->with(
             'periods', $periods
-        )->with('prefilled', $prefilled);
+        )->with('prefilled', $prefilled)->with('subTitle','New envelope');
     }
 
     /**
@@ -52,7 +55,7 @@ class LimitController extends BaseController
      */
     public function delete(\Limit $limit)
     {
-        return View::make('limits.delete')->with('limit', $limit);
+        return View::make('limits.delete')->with('limit', $limit)->with('subTitle','Delete envelope');
     }
 
     /**
@@ -89,7 +92,7 @@ class LimitController extends BaseController
 
         return View::make('limits.edit')->with('limit', $limit)->with('budgets', $budgets)->with(
             'periods', $periods
-        );
+        )->with('subTitle','Edit envelope');
     }
 
     /**
diff --git a/app/views/limits/create.blade.php b/app/views/limits/create.blade.php
index a8645b29e3..6b660ead47 100644
--- a/app/views/limits/create.blade.php
+++ b/app/views/limits/create.blade.php
@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Create an envelope for a budget</small>
-        </h1>
         <p class="text-info">
             Firefly uses an "<a href="http://en.wikipedia.org/wiki/Envelope_System" class="text-success">envelope
                 system</a>" for your budgets, which means that for each period of time (for example a month) a virtual
diff --git a/app/views/limits/delete.blade.php b/app/views/limits/delete.blade.php
index 7f63c93b6d..631405dd93 100644
--- a/app/views/limits/delete.blade.php
+++ b/app/views/limits/delete.blade.php
@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Delete envelope</small>
-        </h1>
         <p class="lead">Remember that deleting something is permanent.</p>
 
     </div>
@@ -34,9 +31,9 @@
             <div class="col-sm-8">
                 <input type="submit" name="submit" value="Remove envelope" class="btn btn-danger" />
                 @if(Input::get('from') == 'date')
-                <a href="{{route('budgets.index')}}" class="btn-default btn">Cancel</a>
+                    <a href="{{route('budgets.index.date')}}" class="btn-default btn">Cancel</a>
                 @else
-                <a href="{{route('budgets.index.budget')}}" class="btn-default btn">Cancel</a>
+                    <a href="{{route('budgets.index.budget')}}" class="btn-default btn">Cancel</a>
                 @endif
             </div>
         </div>
diff --git a/app/views/limits/edit.blade.php b/app/views/limits/edit.blade.php
index fdeb1a359d..e9f2fb90b3 100644
--- a/app/views/limits/edit.blade.php
+++ b/app/views/limits/edit.blade.php
@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Edit envelope</small>
-        </h1>
         <p class="text-info">
             Firefly uses an "<a href="http://en.wikipedia.org/wiki/Envelope_System" class="text-success">envelope
                 system</a>" for your budgets, which means that for each period of time (for example a month) a virtual