diff --git a/MainWindow.xaml b/MainWindow.xaml
index f6280d4..31daa6e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:uctrl="clr-namespace:C4IT_CustomerPanel.UserControls"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
         Title="Customer Panel"
         Height="650"
         Width="500"
@@ -244,11 +245,24 @@
     <Window.TaskbarItemInfo>
         <TaskbarItemInfo />
     </Window.TaskbarItemInfo>
+    <shell:WindowChrome.WindowChrome>
+        <shell:WindowChrome CaptionHeight="72"
+                            CornerRadius="18"
+                            GlassFrameThickness="0"
+                            ResizeBorderThickness="0"
+                            UseAeroCaptionButtons="False" />
+    </shell:WindowChrome.WindowChrome>
 
     <Grid x:Name="MainGrid"
           Background="{DynamicResource backgroundColor}">
-        <DockPanel Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}"
-                   x:Name="MainDock">
+        <Border CornerRadius="18"
+                BorderThickness="1"
+                BorderBrush="{DynamicResource panelBorderColor}"
+                Background="{DynamicResource backgroundColor}"
+                ClipToBounds="True">
+            <Grid>
+                <DockPanel Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}"
+                          x:Name="MainDock">
             <Grid DockPanel.Dock="Top"
                   x:Name="GridTop"
                   Width="{Binding ActualWidth, ElementName=Window, Mode=OneWay}"
@@ -712,12 +726,12 @@
 
 
                         <uctrl:Announcements x:Name="AnnouncementCtrl"
-                                             Canvas.Left="10"
+                                             Canvas.Left="0"
                                              Canvas.Top="10" 
                                              Visibility="Visible"/>
 
                         <uctrl:ComputerInformation x:Name="ComputerInfoCtrl"
-                                                   Canvas.Left="12"
+                                                   Canvas.Left="0"
                                                    Canvas.Top="10" 
                                                    Visibility="Collapsed"/>
 
@@ -739,13 +753,15 @@
                 </Canvas>
             
             </StackPanel>
-        </DockPanel>
-        <Image Source="Resources/United-Kingdom-Flag-icon.png"
-               Panel.ZIndex="1001"
-               VerticalAlignment="Bottom"
-               HorizontalAlignment="Left"
-               Stretch="None"
-               Margin="80,0,0,140" />
+                </DockPanel>
+                <Image Source="Resources/United-Kingdom-Flag-icon.png"
+                       Panel.ZIndex="1001"
+                       VerticalAlignment="Bottom"
+                       HorizontalAlignment="Left"
+                       Stretch="None"
+                       Margin="80,0,0,140" />
+            </Grid>
+        </Border>
     </Grid>
 </Window>
    
diff --git a/UserControls/Announcements.xaml b/UserControls/Announcements.xaml
index d838a77..eead905 100644
--- a/UserControls/Announcements.xaml
+++ b/UserControls/Announcements.xaml
@@ -24,7 +24,8 @@
                 x:FieldModifier="private"
                 Grid.Column="1"
                 Grid.ColumnSpan="2"
-                Grid.Row="0">
+                Grid.Row="0"
+                Height="560">
             <Image Source="{DynamicResource appbar_newspaper}"
                    Width="36"
                    Height="36"
@@ -43,18 +44,18 @@
                           Canvas.Left="0"
                           Visibility="Visible"
                           MinHeight="60"
-                          MaxHeight="470"
+                          MaxHeight="494"
                           Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
                           HorizontalScrollBarVisibility="Disabled"
                           VerticalScrollBarVisibility="Auto" />
-            <StackPanel Canvas.Top="50"
+            <StackPanel Canvas.Top="56"
                         Canvas.Left="0"
                         x:Name="NoAnnouncement"
                         x:FieldModifier="private"
                         Background="Transparent"
                         Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
                         Height="58">
-                <Border Margin="2,6,2,0"
+                <Border Margin="2,0,2,0"
                         BorderThickness="1"
                         CornerRadius="10"
                         BorderBrush="{DynamicResource cardBorderColor}"
diff --git a/UserControls/Incidents.xaml b/UserControls/Incidents.xaml
index 4fa3f78..35da83b 100644
--- a/UserControls/Incidents.xaml
+++ b/UserControls/Incidents.xaml
@@ -56,8 +56,7 @@
           HorizontalAlignment="Center"
           Canvas.Top="10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="250*" />
-            <RowDefinition Height="450" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
@@ -69,7 +68,8 @@
         <Canvas x:Name="Canvas2"
                 Grid.Column="1"
                 Grid.ColumnSpan="2"
-                Grid.Row="0">
+                Grid.Row="0"
+                Height="560">
             <Image Source="{DynamicResource appbar_clipboard_variant_text}"
                    Width="36"
                    Height="36"
@@ -84,7 +84,7 @@
             <ScrollViewer x:Name="CanvasIncident"
                           Canvas.Top="56"
                           Canvas.Left="0"
-                          MaxHeight="460"
+                          MaxHeight="410"
                           MinHeight="60"
                           HorizontalScrollBarVisibility="Disabled"
                           VerticalScrollBarVisibility="Auto"
@@ -94,9 +94,9 @@
                         Background="Transparent"
                         Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}"
                         Height="58"
-                        Canvas.Top="50"
+                        Canvas.Top="56"
                         Canvas.Left="0">
-                <Border Margin="2,6,2,0"
+                <Border Margin="2,0,2,0"
                         BorderThickness="1"
                         CornerRadius="10"
                         BorderBrush="{DynamicResource cardBorderColor}"
@@ -108,7 +108,7 @@
             </StackPanel>
             <Button Foreground="{DynamicResource buttonTextColor}"
                     Style="{StaticResource ButtonStyle}"
-                    Canvas.Top="450"
+                    Canvas.Top="476"
                     Canvas.Left="62"
                     Width="250"
                     Height="40"
@@ -117,17 +117,17 @@
                     x:Name="BtnCreateNewTicket"
                     Click="OnCreateNewTicketClicked"
                     Margin="0 70 0 0" />
+            <Image Source="{DynamicResource appbar_list_check}"
+                   x:Name="buttonReadAllTickets"
+                   Tag="readAllTickets"
+                   Cursor="Hand"
+                   PreviewMouseDown="ReadAll_PreviewMouseDown"
+                   RenderTransformOrigin="1.536,1.429"
+                   Height="24"
+                   Width="24"
+                   Canvas.Left="338"
+                   Canvas.Top="14"
+                   ToolTip="{x:Static resx:Resources.removeMarkups}" />
         </Canvas>
-        <Image Source="{DynamicResource appbar_list_check}"
-               x:Name="buttonReadAllTickets"
-               Tag="readAllTickets"
-               Grid.Column="2"
-               Cursor="Hand"
-               Margin="153,10,0,8"
-               PreviewMouseDown="ReadAll_PreviewMouseDown"
-               RenderTransformOrigin="1.536,1.429"
-               Height="24"
-               Width="24"
-               ToolTip="{x:Static resx:Resources.removeMarkups}" />
     </Grid>
 </UserControl>