diff --git a/ui.py b/ui.py
index cccb30f..7892f9f 100644
--- a/ui.py
+++ b/ui.py
@@ -1,5 +1,7 @@
 # Zeiterfassung
 # UI
+from jeepney.low_level import padding
+
 from definitions import *
 
 import tkinter as tk
@@ -14,9 +16,9 @@ def ui_stempeln(button, label):
     append_timestamp(determine_filename(label))
     global buttons
     if len_timestamps(determine_filename(label)) % 2 == 0:
-        buttons[button].configure(relief="raised", bg="red")
+        buttons[button].configure(relief="raised", bg="red", text="ausgestempelt")
     else:
-        buttons[button].configure(relief="sunken", bg="green")
+        buttons[button].configure(relief="sunken", bg="green", text="eingestempelt")
 
 def win_stempeln(userlist):
     stempeln = tk.Tk()
@@ -26,20 +28,28 @@ def win_stempeln(userlist):
 
     global buttons
     buttons = [ ]
+    in_time_labels = [ ]
+    out_time_labels = [ ]
     button_index = 0
 
-    stempeln.columnconfigure(0, weight=1)
-    stempeln.rowconfigure(0, weight=1)
+    frame_stempeln = tk.Frame(stempeln, borderwidth=5, relief="ridge", padx=10, pady=10)
+    frame_stempeln.grid(row=1, column=1)
 
     for i in userlist:
-
-        button = tk.Button(stempeln, text=i, height=5, command=lambda b=button_index, label=i: ui_stempeln(b, label))
+        label = tk.Label(frame_stempeln, text=i)
+        button = tk.Button(frame_stempeln, command=lambda b=button_index, label=i: ui_stempeln(b, label))
+        in_time = tk.Label(frame_stempeln, text="in", padx=10)
         if len_timestamps(determine_filename(i)) % 2 == 0:
-            button.configure(relief="raised", bg ="red")
+            button.configure(relief="raised", bg ="red", text="ausgestempelt")
         else:
-            button.configure(relief="sunken", bg="green")
-        button.grid(row=button_index, column=0, sticky="ew")
+            button.configure(relief="sunken", bg="green", fg="white", text="eingestempelt")
+        label.grid(row=button_index, column=0, sticky="w")
+        button.grid(row=button_index, column=1, sticky="ew")
+        in_time.grid(row=button_index, column=3, sticky="w")
         buttons.append(button)
+        in_time_labels.append(in_time)
         button_index+=1
 
-    stempeln.mainloop()
\ No newline at end of file
+    stempeln.mainloop()
+
+win_stempeln( ["testuser", "testuser2"])
\ No newline at end of file
diff --git a/users/testuser/2025-4.txt b/users/testuser/2025-4.txt
index c96cedb..42cbe37 100644
--- a/users/testuser/2025-4.txt
+++ b/users/testuser/2025-4.txt
@@ -74,3 +74,9 @@
 1744198393
 1744210902
 1744210904
+1744221414
+1744221415
+1744221946
+1744221947
+1744222133
+1744222135
diff --git a/users/testuser2/2025-4.txt b/users/testuser2/2025-4.txt
index c1403e5..49c705f 100644
--- a/users/testuser2/2025-4.txt
+++ b/users/testuser2/2025-4.txt
@@ -24,3 +24,13 @@
 1744210914
 1744211937
 1744211939
+1744221416
+1744221418
+1744221436
+1744221439
+1744221562
+1744221565
+1744221993
+1744222004
+1744222029
+1744222032