diff --git a/resources/js/components/forum/form.vue b/resources/js/components/forum/form.vue
index a524df386..6bc8c0508 100644
--- a/resources/js/components/forum/form.vue
+++ b/resources/js/components/forum/form.vue
@@ -141,24 +141,27 @@
       </vue-markdown>
     </div>
 
-    <div v-if="showStickyCheckbox" class="form-group">
-      <div class="custom-control custom-checkbox">
-        <label class="custom-control-label" for="is-sticky">
-          <input v-model="topic.is_sticky" type="checkbox" class="custom-control-input" id="is-sticky">
-          Przyklejony wątek
-        </label>
+    <div class="d-flex justify-content-between">
+      <div>
+        <div v-if="showStickyCheckbox" class="form-group">
+          <div class="custom-control custom-checkbox">
+            <label class="custom-control-label" for="is-sticky">
+              <input v-model="topic.is_sticky" type="checkbox" class="custom-control-input" id="is-sticky">
+              Przyklejony wątek
+            </label>
+          </div>
+        </div>
+      </div>
+      <div>
+        <vue-button :disabled="isProcessing" title="Kliknij, aby zapisać (Ctrl+Enter)" class="btn btn-primary btn-sm neon-primary-button" @click="save">
+          <template v-if="post.id">Zapisz</template>
+          <template v-else>Dodaj post</template>
+        </vue-button>
+        {{ ' ' }}
+        <button v-if="post.id" @click="cancel" title="Anuluj (Esc)" class="btn btn-sm btn-danger ms-2">
+          Anuluj
+        </button>
       </div>
-    </div>
-
-    <div class="mt-2">
-      <vue-button :disabled="isProcessing" title="Kliknij, aby zapisać (Ctrl+Enter)" class="btn btn-primary btn-sm neon-primary-button" @click="save">
-        <template v-if="post.id">Zapisz</template>
-        <template v-else>Dodaj post</template>
-      </vue-button>
-      {{ ' ' }}
-      <button v-if="post.id" @click="cancel" title="Anuluj (Esc)" class="btn btn-sm btn-danger me-2">
-        Anuluj
-      </button>
     </div>
   </form>
 </template>
diff --git a/resources/views/forum/topic.twig b/resources/views/forum/topic.twig
index c25e0fc1a..bb4712574 100644
--- a/resources/views/forum/topic.twig
+++ b/resources/views/forum/topic.twig
@@ -147,19 +147,17 @@
         ></vue-form>
       {% endif %}
 
-      <template v-if="is_mode_tree">
-        <div class="d-flex justify-content-end">
+      <template v-if="is_mode_tree && treeTopicPostsRemaining.length > 0">
+        <div class="mb-4" style="margin-top:-24px;">
           <label for="tree-post-ordering" class="text-muted">
             Kolejność postów
           </label>
-        </div>
-        <div class="d-flex justify-content-end align-items-center mb-4">
           {{ icon('treeTopicPostOrder') }}
           <select
               id="tree-post-ordering"
               :value="treeTopicPostOrdering"
               @change="changeTreeTopicPostOrdering"
-              class="form-control ms-1"
+              class="form-control"
               style="width:initial;">
             <option value="orderByMostLikes">Najwyżej oceniane</option>
             <option value="orderByCreationDateNewest">Najnowsze</option>
@@ -207,13 +205,10 @@
 
       <section class="page-change-category d-flex my-3">
         {% if user_forums is defined %}
-          <div class="ms-auto">
-            {{ form_select('forum', user_forums, forum.slug, {'id': 'js-forum-list', 'class': 'form-control d-inline w-auto', 'data-url': route('forum.home')}) }}
-
-            <a class="btn" href="javascript:" id="js-reload" rel="nofollow">
-              {{ icon('forumChangeCategory') }}
-            </a>
-          </div>
+          {{ form_select('forum', user_forums, forum.slug, {'id': 'js-forum-list', 'class': 'form-control d-inline w-auto', 'data-url': route('forum.home')}) }}
+          <a class="btn" href="javascript:" id="js-reload" rel="nofollow">
+            {{ icon('forumChangeCategory') }}
+          </a>
         {% endif %}
       </section>