diff --git a/bibtalk/bib-talk/UI/MainWindow.xaml b/bibtalk/bib-talk/UI/MainWindow.xaml
index bc69b01..9c1e661 100644
--- a/bibtalk/bib-talk/UI/MainWindow.xaml
+++ b/bibtalk/bib-talk/UI/MainWindow.xaml
@@ -60,22 +60,23 @@
                 <RowDefinition Height="392*"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="747*"/>
+                <ColumnDefinition Width="632*"/>
+                <ColumnDefinition Width="115*"/>
                 <ColumnDefinition Width="118*"/>
                 <ColumnDefinition Width="115*"/>
             </Grid.ColumnDefinitions>
             <!-- Draggable Area -->
-            <Grid VerticalAlignment="Top" Height="45" Background="Transparent" MouseLeftButtonDown="DraggableArea_MouseLeftButtonDown" Margin="0,-21,0,0" Grid.ColumnSpan="3">
+            <Grid VerticalAlignment="Top" Height="45" Background="Transparent" MouseLeftButtonDown="DraggableArea_MouseLeftButtonDown" Margin="0,-21,0,0" Grid.ColumnSpan="4">
 
             </Grid>
-            <Rectangle HorizontalAlignment="Left" Height="22" Margin="0,-5,0,0" Stroke="Black" Fill="Black" VerticalAlignment="Top" Width="980" Grid.ColumnSpan="3"/>
+
             <!-- Close Button -->
             <Button Style="{StaticResource InvisibleButtonStyle}"
                     Width="21" 
                     Height="22" 
                     VerticalAlignment="Top" 
                     HorizontalAlignment="Right" 
-                    Click="CloseButton_Click" Grid.Column="2" RenderTransformOrigin="0.057,0.564" Margin="0,-5,0,0">
+                    Click="CloseButton_Click" Grid.Column="3" RenderTransformOrigin="0.057,0.564" Margin="0,-5,0,0">
                 <TextBlock Text="❌" 
                            FontSize="15"
                            Foreground="White" 
@@ -83,7 +84,7 @@
                            HorizontalAlignment="Center" 
                            VerticalAlignment="Top"/>
             </Button>
-            <Grid Margin="298,17,0,176" Grid.ColumnSpan="3">
+            <Grid Margin="298,17,0,176" Grid.ColumnSpan="4">
 
 
                 <Popup x:Name="popup" Placement="Center" IsOpen="False" LostFocus="Popup_LostFocus">
@@ -99,14 +100,14 @@
 
                 <Rectangle Stroke="#FF6332A0" Fill="#FF6332A0" Width="682"/>
                 <TextBlock Text="Name" Margin="108,18,134,18" FontSize="40"  Foreground="White" />
-                <Image Source="/PICA.jpg" Width="80" Height="80" Stretch="Fill" Margin="10,8,592,7">
+                <Image Source="/Icons/PICA.jpg" Width="80" Height="80" Stretch="Fill" Margin="10,8,592,7">
                     <Image.Clip>
                         <EllipseGeometry Center="40,40" RadiusX="40" RadiusY="40"/>
                     </Image.Clip>
                 </Image>
                 <Button Content="⋮" HorizontalAlignment="Left" Margin="638,8,0,0" VerticalAlignment="Top" Width="19" Height="70" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" FontSize="58" Click="ChatFenster_Click"/>
             </Grid>
-            <Grid Margin="76,17,454,176">
+            <Grid Margin="76,17,339,176">
 
                 <Rectangle Stroke="#FF282828" Fill="#FF282828"/>
                 <TextBlock Text="Chats" Foreground="White" FontSize="22" Margin="10,18,134,39" />
@@ -127,18 +128,18 @@
                     </TextBox.RenderTransform>
                 </TextBox>
             </Grid>
-            <Grid Margin="0,17,676,0" Grid.RowSpan="2">
+            <Grid Margin="0,17,561,0" Grid.RowSpan="2">
                 <Rectangle Stroke="#FF323134" Fill="#FF323134"/>
 
             </Grid>
 
 
-            <ListBox x:Name="onlineUsersListBox" Margin="76,112,454,0" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" SelectionChanged="onlineUsersListBox_SelectionChanged" Grid.RowSpan="2">
+            <ListBox x:Name="onlineUsersListBox" Margin="76,112,339,0" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" ScrollViewer.HorizontalScrollBarVisibility="Hidden" SelectionChanged="onlineUsersListBox_SelectionChanged" Grid.RowSpan="2">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal" Width="205" Height="60">
                             <Ellipse Width="10" Height="10" Fill="Green" Margin="5"/>
-                            <Image Source="/PICA.jpg" Width="50" Height="50" Stretch="Fill">
+                            <Image Source="/Icons/PICA.jpg" Width="50" Height="50" Stretch="Fill">
                                 <Image.Clip>
                                     <EllipseGeometry Center="25,25" RadiusX="25" RadiusY="25"/>
                                 </Image.Clip>
@@ -149,7 +150,7 @@
                 </ListBox.ItemTemplate>
             </ListBox>
             <TextBlock HorizontalAlignment="Left" x:Name="loggedinuser" Margin="247,113,0,0" TextWrapping="Wrap" Text="xxxx" VerticalAlignment="Top" Height="84" Width="46" Foreground="White" RenderTransformOrigin="0.6,0.591"/>
-            <ListBox x:Name="chatlistbox" Margin="298,112,0,50" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" Foreground="#FF6332A0" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden" Grid.ColumnSpan="3" Grid.RowSpan="2">
+            <ListBox x:Name="chatlistbox" Margin="298,112,0,50" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" Foreground="#FF6332A0" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden" Grid.ColumnSpan="4" Grid.RowSpan="2">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Margin="5">
@@ -172,8 +173,8 @@
                          Margin="298,346,76,0"
                          Background="#FF323134"
                          Foreground="White"
-                         SelectionBrush="#FF6332A0" KeyDown="messageBOX_KeyDown" Grid.ColumnSpan="3" Grid.Row="1"/>
-            <Button x:Name="weiterbutton" Click="send_Click" Content="Weiter" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="44,346,10,10" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633" Grid.Column="2" Grid.Row="1"/>
+                         SelectionBrush="#FF6332A0" KeyDown="messageBOX_KeyDown" Grid.ColumnSpan="4" Grid.Row="1"/>
+            <Button x:Name="weiterbutton" Click="send_Click" Content="Weiter" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="44,346,10,10" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633" Grid.Column="3" Grid.Row="1"/>