diff --git a/app/routes.php b/app/routes.php
index 77da0dc4e6..103c63eaca 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -37,7 +37,7 @@ Route::bind('limit', function($value, $route)
                 where('limits.id', $value)->
                 leftJoin('components','components.id','=','limits.component_id')->
                 where('components.class','Budget')->
-                where('components.user_id',Auth::user()->id)->first();
+                where('components.user_id',Auth::user()->id)->first(['limits.*']);
         }
         return null;
     });
diff --git a/app/views/limits/delete.blade.php b/app/views/limits/delete.blade.php
index 73e3852579..7f63c93b6d 100644
--- a/app/views/limits/delete.blade.php
+++ b/app/views/limits/delete.blade.php
@@ -6,13 +6,7 @@
             <small>Delete envelope</small>
         </h1>
         <p class="lead">Remember that deleting something is permanent.</p>
-        <p class="text-info">
-            This form allows you to delete the envelope for budget {{{$limit->budget->name}}}, with a content of
-            {{mf($limit->amount,false)}}
-            @if($limit->repeats == 0)
-                in {{$limit->limitrepetitions[0]->startdate->format('M Y')}} ({{$limit->repeat_freq}}).
-            @endif
-        </p>
+
     </div>
 
 </div>
@@ -20,7 +14,15 @@
 {{Form::open(['class' => 'form-horizontal','url' => route('budgets.limits.destroy',$limit->id)])}}
 
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-6">
+        <h4>&nbsp;</h4>
+        <p class="text-info">
+            This form allows you to delete the envelope for budget {{{$limit->budget->name}}}, with a content of
+            {{mf($limit->amount,false)}}
+            @if($limit->repeats == 0)
+            in {{$limit->limitrepetitions[0]->startdate->format('M Y')}} ({{$limit->repeat_freq}}).
+            @endif
+        </p>
         <p class="text-info">
             Destroying an envelope does not remove any transactions from the budget.
         </p>
@@ -38,8 +40,23 @@
                 @endif
             </div>
         </div>
-
     </div>
+    @if($limit->repeats == 1)
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        <h4>Auto repeating</h4>
+        <p class="text-info">
+            This envelope is set to repeat itself; creating a new period whenever the previous period
+            has passed. If you change this envelope, you'll also change the following (automatically created)
+            envelopes.
+            {{$limit->limitrepetitions()->count() }}
+        </p>
+        <ul>
+            @foreach($limit->limitrepetitions()->orderBy('startdate','DESC')->get() as $rep)
+            <li>Evenlope for {{$rep->periodShow()}}, {{mf($rep->amount,false)}}</li>
+            @endforeach
+        </ul>
+    </div>
+    @endif
 </div>
 
 
diff --git a/app/views/limits/edit.blade.php b/app/views/limits/edit.blade.php
index e68734bee1..fdeb1a359d 100644
--- a/app/views/limits/edit.blade.php
+++ b/app/views/limits/edit.blade.php
@@ -94,6 +94,22 @@
         </div>
 
     </div>
+    @if($limit->repeats == 1)
+    <div class="col-lg-6 col-md-6 col-sm-12">
+        <h4>Auto repeating</h4>
+        <p class="text-info">
+            This envelope is set to repeat itself; creating a new period whenever the previous period
+            has passed. If you change this envelope, you'll also change the following (automatically created)
+            envelopes.
+            {{$limit->limitrepetitions()->count() }}
+        </p>
+        <ul>
+            @foreach($limit->limitrepetitions()->orderBy('startdate','DESC')->get() as $rep)
+            <li>Evenlope for {{$rep->periodShow()}}, {{mf($rep->amount,false)}}</li>
+            @endforeach
+        </ul>
+    </div>
+    @endif
 </div>
 
 {{Form::close()}}