diff --git a/DaySchedule.tscn b/DaySchedule.tscn
index c086f02..1d5fc05 100644
--- a/DaySchedule.tscn
+++ b/DaySchedule.tscn
@@ -82,6 +82,8 @@ layout_mode = 2
 
 [node name="CurrentTimeLine" type="Panel" parent="." unique_id=961292687]
 unique_name_in_owner = true
+z_index = 2
+z_as_relative = false
 custom_minimum_size = Vector2(0, 5)
 clip_contents = true
 layout_mode = 2
diff --git a/MeetingControl.cs b/MeetingControl.cs
index c423eb4..f805fba 100644
--- a/MeetingControl.cs
+++ b/MeetingControl.cs
@@ -49,6 +49,10 @@ public partial class MeetingControl : Control
         otherMeetingControl = meetingData.MeetingControl;
         var otherParent = otherMeetingControl.GetParent();
 
+        // TODO: refactor mit Signal
+        var timeSlot = GetParent<TimeSlot>();
+        timeSlot.MeetingControl = otherMeetingControl;
+
         otherMeetingControl.Reparent(GetParent(), false);
         Reparent(otherParent, false);
 
@@ -107,12 +111,24 @@ public partial class MeetingControl : Control
     {
         var tween = CreateTween();
 
-        tween.TweenProperty(
-            this,
-            new NodePath(Control.PropertyName.Scale),
-            new Vector2(1.2f, 1.2f),
-            0.4f
-        );
-        tween.TweenProperty(this, new NodePath(Control.PropertyName.Scale), Vector2.One, 0.4f);
+        tween
+            .TweenProperty(
+                this,
+                new NodePath(Control.PropertyName.OffsetTransformScale),
+                new Vector2(1.2f, 1.2f),
+                0.2f
+            )
+            .SetTrans(Tween.TransitionType.Back)
+            .SetEase(Tween.EaseType.Out);
+
+        tween
+            .TweenProperty(
+                this,
+                new NodePath(Control.PropertyName.OffsetTransformScale),
+                Vector2.One,
+                0.2f
+            )
+            .SetTrans(Tween.TransitionType.Quad)
+            .SetEase(Tween.EaseType.Out);
     }
 }
diff --git a/MeetingControl.tscn b/MeetingControl.tscn
index 41d53f5..110eed8 100644
--- a/MeetingControl.tscn
+++ b/MeetingControl.tscn
@@ -4,6 +4,8 @@
 [ext_resource type="PackedScene" uid="uid://b2cpk0ef3rw87" path="res://MeetingControlGfx.tscn" id="1_o8u20"]
 
 [node name="MeetingControl" type="Control" unique_id=778678487]
+z_index = 1
+z_as_relative = false
 layout_mode = 3
 anchors_preset = 8
 anchor_left = 0.5
@@ -16,6 +18,7 @@ offset_right = 103.0
 offset_bottom = 27.0
 grow_horizontal = 2
 grow_vertical = 2
+offset_transform_enabled = true
 script = ExtResource("1_o5h3n")
 
 [node name="MeetingControlGfx" parent="." unique_id=1923695250 instance=ExtResource("1_o8u20")]