diff --git a/templates/index.html b/templates/index.html
index c369a4b..1154cad 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1204,49 +1204,29 @@
                 class="display-features-list text-white">
 
               {%if professional%}
-
                {% for f in not_displaying2 %}
-
                       <li>{{f}}</li>
-
                   {% endfor%}
-
-
             	{%else%} 
                 
                 <li>Stocks</li>
-
                 <li>Crypto</li>
-
                 <li>Forex</li>
-                
                 <li>Commodities</li>
-                
                 <li>Indices</li>
-
                 <li>Current Weather</li>
-
                 <li>Daily Forecast</li>
-
                 <li>News</li>
-
                 <li>Custom Images</li>
-
                 <li>Custom Messages</li>
-
                 <li>Custom Gifs</li>
-
                 <li>Sports (Upcoming Games)</li>
-
                 <li>Sports (Live Games)</li>
-
                 <li>Sports (Past Games)</li>
-
                 <li>Sports (Team Stats)</li>
-                
                 <li>Movies</li>
-                
                 <li>IPO Calendar</li>
+                <li>Economic Calendar</li>
 
               {%endif%}
                 
@@ -1329,59 +1309,36 @@
     <!-- What to Display in Each Feature -->
 
     <div class="row" style="padding:2%">
-
       <h3 class="pt-3">What to Display in Each Feature</h3>
-
     </div>
 
       <div class="row justify-content-center">
 
           <div class="col-auto">
-
             <label for="dropZ" class="col-form-label">Feature:</label>
-
           </div>
 
           <div class="col-auto">
-
             <select id="drop" class="form-select">
-
               <option value="1">Stocks</option>
-
               <option value="2">Crypto</option>
-
               <option value="3">Forex</option>
-              
               <option value="14">Commodities</option>
-              
               <option value="15">Indices</option>
-
               <option value="4">Current Weather</option>
-
               <option value="5">Daily Forecast</option>
-
               <option value="6">News</option>
-
               <option value="7">Sports (Upcoming Games)</option>
-
               <option value="8">Sports (Past Games)</option>
-
               <option value="9">Sports (Live Games)</option>
-
               <option value="10">Sports (Team Stats)</option>
-
               <option value="11">Custom Images</option>
-
               <option value="12">Custom GIFs</option>
-
               <option value="13">Custom Messages</option>
-              
               <option value="16">Movies</option>
-              
-              <option value="17">IPO Calendar</option> 
-
+              <option value="17">IPO Calendar</option>
+              <option value="18">Economic Calendar</option>
             </select>
-
           </div> 
 
         </div><!-- End Row Dropdown Display Feature -->
@@ -6656,6 +6613,200 @@
 
           </div>      
 
+      
+      
+    <!-- Economic Calendar -->
+
+          <div class="page" id="Page18" style="display: none">
+            <div class="row">
+              <div class="col-lg-6 col-md-6 col-sm-12">
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedZ222" class="col-form-label">Scroll Speed:</label>
+                  </div>
+
+                  <div class="col-auto">
+                    <select
+                      id="economic_speed"
+                      class="form-select speed-select">
+
+                      <option {%if economic_settings.speed == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if economic_settings.speed == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if economic_settings.speed == 'fast' %} selected {% endif %}>Fast</option>
+
+                    </select>
+                  </div>
+                </div>
+
+
+                <div class="row g-3 align-items-center mt-3 left-div">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedRowZ222" class="col-form-label">Scroll Speed (Row 2):</label>
+                  </div>
+
+                  <div class="col-auto">
+                    <select
+                      id="economic_speed2"
+                      class="form-select speed-select">
+
+                      <option {%if economic_settings.speed2 == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if economic_settings.speed2 == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if economic_settings.speed2 == 'fast' %} selected {% endif %}>Fast</option>
+                    </select>
+
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">Intro Transition:
+                    </label>
+
+                  </div>
+
+                  <div class="col-auto">
+                    <select id="economic_animation" class="form-select animation-select">
+                      <option {%if economic_settings.animation == 'down' %} selected {% endif %}>Down</option>
+                      <option {%if economic_settings.animation == 'up' %} selected {% endif %}>Up</option>
+                      <option {%if economic_settings.animation == 'continuous' %} selected {% endif %}>Continuous</option>
+                    </select>
+                  </div>
+
+                </div>
+
+                <div class="row g-3 align-items-center left-div" style="padding-top: 25px;">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">
+                      Display Feature Title
+                    </label>
+                  </div>
+
+                  <div class="col-auto">
+                    <input
+                      class="form-check-input title-select"
+                      type="checkbox"
+                      value=""
+                      id="economic_settings_title"
+
+                      {% if economic_settings.title%}
+                      checked
+                      {%endif%}
+                    />
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Countries: </label>
+                  </div>
+
+                  <div class="col-auto">
+                    <select id="inputTransition2222" class="form-select economic-countries-select">
+                      <option>United States</option><option>Canada</option><option>United Kingdom</option><option>China</option>
+                      <option>Germany</option><option>France</option><option>Italy</option><option>Singapore</option><option>South Korea</option>
+                      <option>Japan</option><option>Australia</option><option>New Zealand</option><option>India</option><option>Switzerland</option>
+                      <option>Spain</option><option>Hong Kong</option><option>Portugal</option><option>Netherlands</option><option>Belgium</option>
+                      <option>Austria</option><option>Denmark</option><option>Turkey</option><option>Brazil</option><option>Mexico</option>
+                      <option>Sweden</option><option>Finland</option><option>Norway</option><option>Taiwan</option><option>Indonesia</option>
+                      <option>Philippines</option><option>Thailand</option><option>South Africa</option>
+                    </select>
+                  </div>
+
+                  <div class="col-auto">
+                    <button id="economic-countries-btn" class="btn set-btn">Add</button>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Importance: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="inputTransition2225" class="form-select economic-importance-select">
+                      <option {%if economic_settings.importance == -1 %} selected {% endif %}>Low - High</option>
+                      <option {%if economic_settings.importance == 0 %} selected {% endif %}>Med - High</option>
+                      <option {%if economic_settings.importance == 1 %} selected {% endif %}>High</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Timezone: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="inputTransition22259" class="form-select economic-tz-select">
+                      <option {%if scheduler_settings.timezone == 'US/Eastern' %} selected {% endif %}>US/Eastern</option>
+                      <option {%if scheduler_settings.timezone == 'US/Central' %} selected {% endif %}>US/Central</option>
+                      <option {%if scheduler_settings.timezone == 'US/Pacific' %} selected {% endif %}>US/Pacific</option>
+                      <option {%if scheduler_settings.timezone == 'GMT' %} selected {% endif %}>GMT</option>
+                      <option {%if scheduler_settings.timezone == 'CET' %} selected {% endif %}>CET</option>
+                      <option {%if scheduler_settings.timezone == 'GB' %} selected {% endif %}>GB</option>
+                      <option {%if scheduler_settings.timezone == 'NZ' %} selected {% endif %}>NZ</option>
+                      <option {%if scheduler_settings.timezone == 'Australia/ACT' %} selected {% endif %}>Australia/ACT</option>
+                      <option {%if scheduler_settings.timezone == 'Japan' %} selected {% endif %}>Japan</option>
+                      <option {%if scheduler_settings.timezone == 'Asia/Singapore' %} selected {% endif %}>Asia/Singapore</option>
+                      <option {%if scheduler_settings.timezone == 'Asia/Dubai' %} selected {% endif %}>Asia/Dubai</option>
+                    </select>
+                  </div>
+                </div>
+
+
+              </div>
+
+
+
+              <div class="col-lg-4 col-md-4 col-sm-12">
+                <h6 class="mt-3">List:</h6>
+                <div class="features-div-two">
+                  <ul
+                    id="economic-list"
+                    class="display-features-list text-white symbol-list"
+                  >
+                  </ul>
+                </div>
+              </div>
+
+              <div class="col-lg-2 col-md-2 col-sm-12">
+                <div class="icons-list">
+                  <i
+                    id="economic-increase-btn"
+                    class="upbutton fa fa-chevron-up"
+                    aria-hidden="true"
+                  ></i>
+
+                  <br />
+                  <br />
+
+                  <i
+                    id="economic-decrease-btn"
+                    class="downbutton fa fa-chevron-down"
+                    aria-hidden="true"
+                  ></i>
+
+                  <a style="position: relative; bottom: 30px; left: 10px">Sort Order</a>
+                  <br />
+                  <br />
+
+                  <i
+                    id="economic-remove-btn"
+                    class="fa fa-minus"
+                    aria-hidden="true"
+                  ></i>
+
+                  <span style="position: relative; bottom: 0; left: 10px">Remove</span>
+
+                </div>
+              </div>
+            </div>
+
+            <div class="save-btn-div">
+              <a href="#" class="btn save-btn">Save</a>
+            </div>
+
+          </div>      
+
+      
 
     <!-- IPO Calendar -->