diff --git a/helpdesk/templates/helpdesk/filters/sorting.html b/helpdesk/templates/helpdesk/filters/sorting.html
index 2661f65e..6ae019a9 100644
--- a/helpdesk/templates/helpdesk/filters/sorting.html
+++ b/helpdesk/templates/helpdesk/filters/sorting.html
@@ -4,7 +4,7 @@
     <div class="col col-sm-3">
       <label for='id_sort' class="col-form-label">{% trans "Sorting" %}:</label>
     </div>
-    <div class="col col-sm-3">
+    <div class="col col-sm-3 pt-2">
             <select id='id_sort' name='sort' class="">
                 <option value='created'{% if query_params.sorting == "created"%} selected='selected'{% endif %}>
                     {% trans "Created" %}
@@ -29,7 +29,7 @@
   <div class="col col-sm-2">
     <label for='id_sortreverse' class="col-form-label">{% trans "Reverse" %}</label>
   </div>
-  <div class="col col-sm-3">
+  <div class="col col-sm-3 pt-2">
     <input type='checkbox' name='sortreverse' id='id_sortreverse'{% if query_params.sortreverse %} checked='checked'{% endif %} />
   </div>
   <div class="col col-sm-1">
diff --git a/helpdesk/templates/helpdesk/navigation-sidebar.html b/helpdesk/templates/helpdesk/navigation-sidebar.html
index 36ce6ece..8fbb80ad 100644
--- a/helpdesk/templates/helpdesk/navigation-sidebar.html
+++ b/helpdesk/templates/helpdesk/navigation-sidebar.html
@@ -23,7 +23,7 @@
           <div class="dropdown-menu" aria-labelledby="ticketsDropdown">
             {% if user_saved_queries_ %}
             {% for q in user_saved_queries_ %}
-            <a class="dropdown-item small" href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}">{{ q.title }}
+            <a class="dropdown-item small" href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}" style="white-space: normal;">{{ q.title }}
                 {% if q.shared %}
                 (Shared{% if user != q.user %} by {{ q.user.get_username }}{% endif %})
                 {% endif %}
diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html
index ec217264..1a7771b5 100644
--- a/helpdesk/templates/helpdesk/ticket_desc_table.html
+++ b/helpdesk/templates/helpdesk/ticket_desc_table.html
@@ -15,27 +15,29 @@
                             <h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }}</h3>
                             {% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}
                             <span class='ticket_toolbar float-right'>
-                                <a href="{% url 'helpdesk:edit' ticket.id %}" class="btn btn-warning btn-sm ticket-edit">
-                                    <i class="fas fa-pencil-alt"></i> {% trans "Edit" %}
-                                </a>
-                                | <a href="{% url 'helpdesk:delete' ticket.id %}" class="btn btn-danger btn-sm ticket-delete">
-                                    <i class="fas fa-trash-alt"></i> {% trans "Delete" %}
-                                </a>
-                                | {% if ticket.on_hold %}
-                                    <form class="form-inline ticket-hold" method='post' action='unhold/'>
-                                        {% csrf_token %}
-                                        <button class="btn btn-warning btn-sm" type='submit'>
-                                            <i class="fas fa-play"></i> {% trans "Unhold" %}
-                                        </button>
-                                    </form>
-                                {% else %}
-                                    <form class="form-inline ticket-hold" method='post' action='hold/'>
-                                        {% csrf_token %}
-                                        <button class="btn btn-warning btn-sm" type='submit'>
-                                            <i class="fas fa-pause"></i> {% trans "Hold" %}
-                                        </button>
-                                    </form>
-                                {% endif %}
+                                <div class="btn-group" style="gap: 8px;">
+                                    <a href="{% url 'helpdesk:edit' ticket.id %}" class="btn btn-warning btn-sm ticket-edit">
+                                        <i class="fas fa-pencil-alt"></i> {% trans "Edit" %}
+                                    </a>
+                                    | <a href="{% url 'helpdesk:delete' ticket.id %}" class="btn btn-danger btn-sm ticket-delete">
+                                        <i class="fas fa-trash-alt"></i> {% trans "Delete" %}
+                                    </a>
+                                    | {% if ticket.on_hold %}
+                                        <form class="form-inline ticket-hold" method='post' action='unhold/'>
+                                            {% csrf_token %}
+                                            <button class="btn btn-warning btn-sm" type='submit'>
+                                                <i class="fas fa-play"></i> {% trans "Unhold" %}
+                                            </button>
+                                        </form>
+                                    {% else %}
+                                        <form class="form-inline ticket-hold" method='post' action='hold/'>
+                                            {% csrf_token %}
+                                            <button class="btn btn-warning btn-sm" type='submit'>
+                                                <i class="fas fa-pause"></i> {% trans "Hold" %}
+                                            </button>
+                                        </form>
+                                    {% endif %}
+                                </div>
                             </span>
                         </th>
                     </tr>