diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java
index 4da8c43ac..2896ce7dc 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java
@@ -57,9 +57,9 @@ public class TargetActionsHistory extends Grid<TargetActionsHistory.ActionStatus
                 .setComparator(ActionStatusEntry::getLastModifiedAt);
 
         addColumn(new ComponentRenderer<>(ActionStatusEntry::getForceTypeIcon)).setHeader("Type").setAutoWidth(true).setFlexGrow(0);
-        addColumn(new ComponentRenderer<>(ActionStatusEntry::getActionsLayout)).setHeader("Actions").setAutoWidth(true).setFlexGrow(0);
+        addColumn(new ComponentRenderer<>(ActionStatusEntry::getActionsLayout)).setHeader("Actions").setAutoWidth(true).setFlexGrow(0).setFrozenToEnd(true);
         addColumn(new ComponentRenderer<>(ActionStatusEntry::getForceQuitLayout)).setHeader("Force Quit").setAutoWidth(true)
-                .setFlexGrow(0);
+                .setFlexGrow(0).setFrozenToEnd(true);;
         addItemClickListener(e -> actionStepsGrid.setActionId(e.getItem().action.getId()));
         this.actionStepsGrid = actionStepsGrid;
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
index e8f1bb992..53e07d0d5 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
@@ -353,6 +353,7 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
 
         private TargetDetailedView(final HawkbitMgmtClient hawkbitClient) {
             final TabSheet tabSheet = new TabSheet();
+            tabSheet.setWidthFull();
             targetId = new Span();
             targetDetails = new TargetDetails(hawkbitClient);
             targetAssignedInstalled = new TargetAssignedInstalled(hawkbitClient);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
index 1d5f452d4..24f4897a7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
@@ -75,7 +75,6 @@ public class TableView<T, ID> extends Div implements Constants, BeforeEnterObser
         splitLayout = new SplitLayout();
         splitLayout.setSizeFull();
         splitLayout.setOrientation(SplitLayout.Orientation.HORIZONTAL);
-        splitLayout.addThemeVariants(SplitLayoutVariant.LUMO_SMALL);
         splitLayout.setSplitterPosition(100);
         splitLayout.addToPrimary(selectionGrid);
         detailsPanel = new Div();