diff --git a/templates/bills.html b/templates/bills.html
index 9a01d23..a1f78c6 100644
--- a/templates/bills.html
+++ b/templates/bills.html
@@ -25,7 +25,7 @@
     <table>
     {% for bt in total %}
         <tr><td></td><td>&nbsp;{{bt}}:</td>
-        {% for yr in range( 2025, 2032 ) %}
+        {% for yr in range( FIRST_YEAR, END_YEAR+1 ) %}
             {% if yr in total[bt] %}
                 <td>
                 {{total[bt][yr]}}
@@ -62,7 +62,7 @@
             <div class="px-0 col"><label class="form-control d-flex
                 align-items-end justify-content-center h-100 border-0 fw-bold
                 bg-body-tertiary rounded-0">Annual Growth</ ></div>
-            {% for yr in range( 2025, 2032 ) %}
+            {% for yr in range( FIRST_YEAR, END_YEAR+1 ) %}
                 <div class="px-0 col"><label class="form-control d-flex
                     align-items-end justify-content-center h-100 border-0
                     fw-bold bg-body-tertiary rounded-0">{{yr}} Total</ ></div>
@@ -119,7 +119,7 @@
                         </select>
                     </div>
                 </div>
-                {% for yr in range( 2025, 2032 ) %}
+                {% for yr in range( FIRST_YEAR, END_YEAR+1 ) %}
                     <div class="px-0 col"><input type="text" class="bill-type-total-{{bt.id}} form-control text-center" id="bill-type-total-{{bt.id}}" value="${{'%.2f'|format(total[bt.id][yr])}}" disabled> </div>
                 {% endfor %}
                 <button id="bill-type-chg-{{bt.id}}" class="px-0 col btn btn-success bg-success-subtle text-success" onClick="StartUpdateBillType( {{bt.id}} )"><span class="bi bi-pencil-square"> Change</button>
@@ -129,8 +129,8 @@
             </div>
         {% endfor %}
         <div class="row">
-            <div class="px-0 col"></div>
-            <div class="px-0 col"></div>
+            <div class="px-0 col-1"></div>
+            <div class="px-0 col-1"></div>
             <div class="px-0 col"><input type="text" class="form-control text-end text-primary fs-5" value="TOTAL:"></div>
         {% for yr in range( this_year, END_YEAR+1) %}
             {% set tot=namespace( sum=0 ) %}