diff --git a/templates/index.html b/templates/index.html
index 496d539..514d301 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7076,8 +7076,16 @@
                   </div>
                   <div class="col-auto">
                     <select id="jokes-amount" class="form-select jokes-amount-select">
-                      <option>1</option><option>2</option><option>3</option><option>4</option><option>5</option>
-                      <option>6</option><option>7</option><option>8</option><option>9</option><option>10</option>
+                      <option {%if jokes_settings.amount == '1' %} selected {% endif %}>1</option>
+                      <option {%if jokes_settings.amount == '2' %} selected {% endif %}>2</option>
+                      <option {%if jokes_settings.amount == '3' %} selected {% endif %}>3</option>
+                      <option {%if jokes_settings.amount == '4' %} selected {% endif %}>4</option>
+                      <option {%if jokes_settings.amount == '5' %} selected {% endif %}>5</option>
+                      <option {%if jokes_settings.amount == '6' %} selected {% endif %}>6</option>
+                      <option {%if jokes_settings.amount == '7' %} selected {% endif %}>7</option>
+                      <option {%if jokes_settings.amount == '8' %} selected {% endif %}>8</option>
+                      <option {%if jokes_settings.amount == '9' %} selected {% endif %}>9</option>
+                      <option {%if jokes_settings.amount == '10' %} selected {% endif %}>10</option>
                     </select>
                   </div>
                 </div>
@@ -7091,6 +7099,9 @@
                   <ul
                     id="jokes-list"
                     class="display-features-list text-white symbol-list">
+                  {% for f in jokes_settings.categories %}
+                      <li>{{f}}</li>
+                    {% endfor%}
                   </ul>
                 </div>
               </div>