diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java
index 0199aa9..c0e928d 100644
--- a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java
+++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java
@@ -60,14 +60,14 @@ public class NodeList extends VerticalLayout {
 
         grid.addColumn(RNode::getId).setHeader("Identifier").setSortable(true);
         grid.addColumn(node -> node.getMode().getName()).setHeader("Mode").setSortable(true);
-        grid.addComponentColumn(this::createManageButtons).setHeader("Manage");
+        grid.addComponentColumn(this::createManageButtons).setFrozenToEnd(true);
 
         grid.setMultiSort(true, Grid.MultiSortPriority.APPEND);
         return grid;
     }
 
     private HorizontalLayout createManageButtons(RNode node) {
-        var layout = new HorizontalLayout();
+        var layout = new HorizontalLayout(JustifyContentMode.END);
 
         {
             var button = new Button("Details");
diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java
index 75e9cc3..28309bf 100644
--- a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java
+++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java
@@ -106,14 +106,14 @@ public class RoomList extends VerticalLayout {
         }).setComparator((room1, room2) -> Boolean.compare(room1.locked(), room2.locked())).setSortable(true)
                 .setHeader("Locked").setTextAlign(ColumnTextAlign.CENTER);
 
-        grid.addComponentColumn(this::createManageButtons).setHeader("Manage");
+        grid.addComponentColumn(this::createManageButtons).setFrozenToEnd(true);
 
         grid.setMultiSort(true, Grid.MultiSortPriority.APPEND);
         return grid;
     }
 
     private HorizontalLayout createManageButtons(RRoom.Short room) {
-        var layout = new HorizontalLayout();
+        var layout = new HorizontalLayout(JustifyContentMode.END);
 
         {
             var button = new Button("Details");
diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java
index 4a698b6..ff61189 100644
--- a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java
+++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java
@@ -65,7 +65,7 @@ public class UserList extends VerticalLayout {
                     return Integer.compare(r1, r2);
                 }).setSortable(true).setFooter(occupancy);
 
-        grid.addComponentColumn(this::createManageButton).setHeader("Manage");
+        grid.addComponentColumn(this::createManageButton).setTextAlign(ColumnTextAlign.END).setFrozenToEnd(true);
 
         grid.setSelectionMode(Grid.SelectionMode.MULTI);
         grid.addSelectionListener(event -> updateButtonRemove());
diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java
index 6b27910..3593712 100644
--- a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java
+++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java
@@ -3,6 +3,7 @@ package ru.dragonestia.picker.cp.page;
 import com.vaadin.flow.component.Html;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.grid.ColumnTextAlign;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.html.H3;
@@ -71,7 +72,7 @@ public class UserDetailsPage extends VerticalLayout implements BeforeEnterObserv
                 getUI().ifPresent(ui -> ui.navigate("/nodes/%s/rooms/%s".formatted(room.nodeId(), room.id())));
             });
             return button;
-        }).setHeader("Other");
+        }).setTextAlign(ColumnTextAlign.END).setFrozenToEnd(true);
 
         grid.setMultiSort(true, Grid.MultiSortPriority.APPEND);
         return grid;
diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java
index bc44b9f..38b2768 100644
--- a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java
+++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java
@@ -77,7 +77,7 @@ public class UserSearchPage extends VerticalLayout {
                 getUI().ifPresent(ui -> ui.navigate("/users/" + user.getId()));
             });
             return button;
-        }).setHeader("Manage");
+        }).setTextAlign(ColumnTextAlign.END).setFrozenToEnd(true);
 
         grid.setMultiSort(true, Grid.MultiSortPriority.APPEND);
         return grid;