diff --git a/src/main/java/de/assecutor/votianlt/pages/base/ui/component/ViewToolbar.java b/src/main/java/de/assecutor/votianlt/pages/base/ui/component/ViewToolbar.java
index b703bc0..cd62d86 100644
--- a/src/main/java/de/assecutor/votianlt/pages/base/ui/component/ViewToolbar.java
+++ b/src/main/java/de/assecutor/votianlt/pages/base/ui/component/ViewToolbar.java
@@ -26,7 +26,7 @@ public final class ViewToolbar extends Composite<Header> {
 
         if (components.length > 0) {
             var actions = new Div(components);
-            actions.addClassNames(Display.FLEX, FlexDirection.COLUMN, JustifyContent.BETWEEN, Flex.GROW, Gap.SMALL,
+            actions.addClassNames(Display.FLEX, FlexDirection.COLUMN, JustifyContent.END, Flex.GROW, Gap.SMALL,
                     FlexDirection.Breakpoint.Medium.ROW);
             getContent().add(actions);
         }
diff --git a/src/main/java/de/assecutor/votianlt/pages/view/JobHistoryView.java b/src/main/java/de/assecutor/votianlt/pages/view/JobHistoryView.java
index 06ad5c7..780277a 100644
--- a/src/main/java/de/assecutor/votianlt/pages/view/JobHistoryView.java
+++ b/src/main/java/de/assecutor/votianlt/pages/view/JobHistoryView.java
@@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
 
 @Route(value = "job_history", layout = de.assecutor.votianlt.pages.base.ui.view.MainLayout.class)
-@PageTitle("Job History")
+@PageTitle("Job Historie")
 @RolesAllowed("USER")
 @Slf4j
 public class JobHistoryView extends Main implements HasUrlParameter<String> {
@@ -57,7 +57,7 @@ public class JobHistoryView extends Main implements HasUrlParameter<String> {
                 LumoUtility.FlexDirection.COLUMN, LumoUtility.Padding.MEDIUM,
                 LumoUtility.Gap.SMALL);
 
-        add(new ViewToolbar("Job History"));
+        add(new ViewToolbar("Job Historie"));
 
         content = new VerticalLayout();
         content.setSpacing(true);
@@ -96,7 +96,7 @@ public class JobHistoryView extends Main implements HasUrlParameter<String> {
         content.removeAll();
 
         // Header mit Job-Informationen
-        H2 header = new H2("Job History - " + (job.getJobNumber() != null ? job.getJobNumber() : "Unbekannte Auftragsnummer"));
+        H2 header = new H2("Job Historie - " + (job.getJobNumber() != null ? job.getJobNumber() : "Unbekannte Auftragsnummer"));
         content.add(header);
 
         // Job basic info for context
@@ -123,7 +123,7 @@ public class JobHistoryView extends Main implements HasUrlParameter<String> {
                 content.add(timeline);
             }
         } catch (Exception e) {
-            Span errorMessage = new Span("Fehler beim Laden der Job History: " + e.getMessage());
+            Span errorMessage = new Span("Fehler beim Laden der Job Historie: " + e.getMessage());
             errorMessage.getStyle().set("color", "var(--lumo-error-text-color)");
             content.add(errorMessage);
         }
diff --git a/src/main/java/de/assecutor/votianlt/pages/view/JobSummaryView.java b/src/main/java/de/assecutor/votianlt/pages/view/JobSummaryView.java
index d135db9..54e669e 100644
--- a/src/main/java/de/assecutor/votianlt/pages/view/JobSummaryView.java
+++ b/src/main/java/de/assecutor/votianlt/pages/view/JobSummaryView.java
@@ -118,7 +118,7 @@ public class JobSummaryView extends Main implements HasUrlParameter<String> {
         }
 
         // Create Job History Button for toolbar
-        Button jobHistoryButton = new Button("Job History");
+        Button jobHistoryButton = new Button("Job Historie");
         jobHistoryButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         jobHistoryButton.addClickListener(e -> {
             getUI().ifPresent(ui -> ui.navigate("job_history/" + job.getId().toHexString()));