diff --git a/MainWindow.xaml b/MainWindow.xaml
index d913c0d..a323987 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -474,6 +474,8 @@
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
                                    Tag="Signal"
+                                   Width="12"
+                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -530,6 +532,8 @@
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
                                    Tag="Signal"
+                                   Width="12"
+                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -585,6 +589,8 @@
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
                                    Tag="Signal"
+                                   Width="12"
+                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -641,6 +647,8 @@
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
                                    Tag="Signal"
+                                   Width="12"
+                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -697,6 +705,8 @@
                                    Panel.ZIndex="18"
                                    Style="{StaticResource ImageStyle}"
                                    Tag="Signal"
+                                   Width="12"
+                                   Height="12"
                                    Stretch="None"
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
@@ -747,6 +757,7 @@
 
                         <uctrl:CustomLinks x:Name="CustomLinksCtrl"
                                            Canvas.Left="0"
+                                           Canvas.Top="10"
                                            Visibility="Collapsed" />
 
                     </Canvas>
diff --git a/UserControls/AnnouncementListItem.xaml b/UserControls/AnnouncementListItem.xaml
index b0f470f..d0adff9 100644
--- a/UserControls/AnnouncementListItem.xaml
+++ b/UserControls/AnnouncementListItem.xaml
@@ -39,7 +39,7 @@
             </Grid.RowDefinitions>
             <Grid Background="{Binding Path=PrioColor}" Grid.RowSpan="3" x:Name="annColor"></Grid>
             <DockPanel Grid.Column="1" >
-                <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0"  />
+                <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="12" Height="12" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0"  />
                 <TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
             </DockPanel>
 
diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index f01f9fe..a478bf0 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -76,324 +76,347 @@
 
     <!--ComputerInformation-->
     <Grid x:Name="GridInfo" x:FieldModifier="private"
-          Width="500"
-          Height="560"
-          Canvas.Left="0"
-          Canvas.Top="0">
+          Width="500">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
             <ColumnDefinition Width="185*" />
-            <ColumnDefinition Width="134*" />
-            <ColumnDefinition Width="51*" />
+            <ColumnDefinition Width="185*" />
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="56" />
-            <RowDefinition Height="72" />
-            <RowDefinition Height="72" />
-            <RowDefinition Height="72" />
-            <RowDefinition Height="72" />
-            <RowDefinition Height="72" />
-            <RowDefinition Height="72" />
-            <RowDefinition Height="72" />
+            <RowDefinition Height="6*" />
+            <RowDefinition Height="7*" />
         </Grid.RowDefinitions>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="1"
-                Height="70">
-            <Image Source="{DynamicResource appbar_monitor}"
-                   Height="34"
-                   x:Name="icoComputer_Inline" x:FieldModifier="private" />
-            <Label Foreground="{DynamicResource sectionTitleColor}"
-                   x:Name="LblComputername" x:FieldModifier="private"
-                   Content="{x:Static resx:Resources.computername}"
-                   FontSize="16"
-                   Canvas.Top="10"
-                   Canvas.Left="40" />
-            <TextBox Canvas.Left="15"
-                     Width="300"
-                     FontSize="16"
-                     VerticalAlignment="Center"
-                     Style="{StaticResource InfoTextBoxStyle}"
-                     x:Name="TxtComputername" x:FieldModifier="private"
-                     IsReadOnly="true"
-                     Canvas.Top="45"
-                     Height="25"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-            <Image Cursor="Hand"
-                   Source="{DynamicResource appbar_page_copy}"
-                   Height="25"
-                   x:Name="icoCopyComputer" x:FieldModifier="private"
-                   Tag="MAINICO"
-                   HorizontalAlignment="Right"
-                   Canvas.Left="315"
-                   Canvas.Top="45"
-                   Width="28"
-                   PreviewMouseDown="ClickCopyIcon" />
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="2"
-                Height="70">
-            <Image Source="{DynamicResource appbar_network}"
-                   Height="34"
-                   x:Name="icoNetwork_Inline" x:FieldModifier="private" />
-            <Label Foreground="{DynamicResource sectionTitleColor}"
-                   FontSize="16"
-                   x:Name="LblIpaddress" x:FieldModifier="private"
-                   Content="{x:Static resx:Resources.ipaddress}"
-                   Canvas.Top="10"
-                   Canvas.Left="40" />
-            <TextBox Canvas.Left="15"
-                     Width="300"
-                     Height="25"
-                     VerticalAlignment="Center"
-                     FontSize="16"
-                     Style="{StaticResource InfoTextBoxStyle}"
-                     x:Name="TxtIpaddress" x:FieldModifier="private"
-                     IsReadOnly="true"
-                     Canvas.Top="45"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-            <Image Cursor="Hand"
-                   Source="{DynamicResource appbar_page_copy}"
-                   Height="25"
-                   x:Name="icoCopyNetwork" x:FieldModifier="private"
-                   Tag="MAINICO"
-                   HorizontalAlignment="Right"
-                   Canvas.Left="312"
-                   Canvas.Top="45"
-                   Width="28"
-                   PreviewMouseDown="ClickCopyIcon" />
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="3"
-                Height="70"
-                x:Name="CanvasHostname" x:FieldModifier="private">
-            <Image Source="{DynamicResource appbar_remotehost}"
-                   Height="34"
-                   x:Name="icoHost_Inline" x:FieldModifier="private"/>
-            <Label Foreground="{DynamicResource sectionTitleColor}"
-                   x:Name="LblHostname" x:FieldModifier="private"
-                   Content="{x:Static resx:Resources.Hostname}"
-                   FontSize="16"
-                   Canvas.Top="10"
-                   Canvas.Left="40" />
-            <TextBox Canvas.Left="15"
-                     Width="300"
-                     FontSize="16"
-                     VerticalAlignment="Center"
-                     Style="{StaticResource InfoTextBoxStyle}"
-                     x:Name="TxtHostname" x:FieldModifier="private"
-                     IsReadOnly="true"
-                     Canvas.Top="45"
-                     Height="25"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-            <Image Cursor="Hand"
-                   Source="{DynamicResource appbar_page_copy}"
-                   Height="25"
-                   x:Name="icoCopyHost" x:FieldModifier="private"
-                   Tag="MAINICO"
-                   HorizontalAlignment="Right"
-                   Canvas.Left="315"
-                   Canvas.Top="45"
-                   Width="28"
-                   PreviewMouseDown="ClickCopyIcon" />
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="4"
-                Height="70">
-            <Image Source="{DynamicResource appbar_people}"
-                   Height="34"
-                   x:Name="icoUser_Inline" x:FieldModifier="private" />
-            <Label Foreground="{DynamicResource sectionTitleColor}"
-                   FontSize="16"
-                   x:Name="LblUsername" x:FieldModifier="private"
-                   Content="{x:Static resx:Resources.username}"
-                   Canvas.Top="10"
-                   Canvas.Left="40" />
-            <TextBox Canvas.Left="15"
-                     Width="300"
-                     Height="25"
-                     VerticalAlignment="Center"
-                     FontSize="16"
-                     Style="{StaticResource InfoTextBoxStyle}"
-                     x:Name="TxtUsername" x:FieldModifier="private"
-                     IsEnabled="true"
-                     IsReadOnly="true"
-                     Canvas.Top="45"
-                     PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-            <Image Cursor="Hand"
-                   Source="{DynamicResource appbar_page_copy}"
-                   Height="25"
-                   x:Name="icoCopyUser" x:FieldModifier="private"
-                   Tag="MAINICO"
-                   HorizontalAlignment="Right"
-                   Canvas.Left="312"
-                   Canvas.Top="45"
-                   Width="28"
-                   PreviewMouseDown="ClickCopyIcon" />
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="5"
-                Height="70">
-            <Image Source="{DynamicResource appbar_reset}"
-                   Height="34"
-                   x:Name="icoRestart_Inline" x:FieldModifier="private"
-                   Tag="MAINICO" />
-            <Label  Foreground="{DynamicResource sectionTitleColor}"
-                    FontSize="16"
-                    x:Name="LblLastreboot" x:FieldModifier="private"
-                    Content="{x:Static resx:Resources.lastreboot}"
-                    Canvas.Top="10"
-                    Canvas.Left="40" />
-            <TextBox Canvas.Left="15"
-                     Width="300"
-                     Height="25"
-                     VerticalAlignment="Center"
-                     FontSize="16"
-                     Style="{StaticResource InfoTextBoxStyle}"
-                     x:Name="TxtLastreboot" x:FieldModifier="private"
-                     IsReadOnly="true"
-                     Canvas.Top="45"
-                     MouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
-            <Image Cursor="Hand"
-                   Source="{DynamicResource appbar_page_copy}"
-                   Height="25"
-                   x:Name="icoCopyRestart" x:FieldModifier="private"
-                   Tag="MAINICO"
-                   HorizontalAlignment="Right"
-                   Canvas.Left="312"
-                   Canvas.Top="45"
-                   Width="28"
-                   PreviewMouseDown="ClickCopyIcon" />
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="6"
-                Height="70">
-            <Image Source="{DynamicResource appbar_folder_ellipsis}"
-                   Height="34"
-                   x:Name="icoDrive_Inline" x:FieldModifier="private"
-                   Tag="MAINICO" />
-            <Label Foreground="{DynamicResource sectionTitleColor}"
-                   x:Name="LblDrives" x:FieldModifier="private"
-                   Content="{x:Static resx:Resources.drives}"
-                   FontSize="16"
-                   Canvas.Top="10"
-                   Canvas.Left="40" />
-            <StackPanel Canvas.Left="15"
-                        Canvas.Top="40"
-                        Orientation="Vertical"
-                        Width="300">
-                <StackPanel  x:Name="StPaDrives" x:FieldModifier="private"
-                             CanHorizontallyScroll="True"
-                             CanVerticallyScroll="True"
-                             MinHeight="30"
-                             HorizontalAlignment="Center"
-                             VerticalAlignment="Stretch"
-                             MaxHeight="30"
-                             Orientation="Horizontal" />
-                <StackPanel  x:Name="StPaDrives2" x:FieldModifier="private"
-                             CanHorizontallyScroll="True"
-                             CanVerticallyScroll="True"
-                             MinHeight="30"
-                             HorizontalAlignment="Center"
-                             VerticalAlignment="Stretch"
-                             MaxHeight="30"
-                             Orientation="Horizontal" />
-            </StackPanel>
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="7"
-                Height="70">
-            <Label Content="{x:Static resx:Resources.genReportHeader}"
-                   Foreground="{DynamicResource sectionTitleColor}"
-                   Canvas.Left="53"
-                   Canvas.Top="15"
-                   FontSize="16"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Top" />
-            <Grid Width="300"
-                  Canvas.Left="15"
-                  Canvas.Top="50">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="43*" />
-                    <ColumnDefinition Width="57*" />
-                </Grid.ColumnDefinitions>
-                <Button Foreground="{DynamicResource buttonTextColor}"
-                        HorizontalAlignment="Left"
-                        Style="{StaticResource ButtonStyle}"
-                        Width="250"
-                        Height="40"
-                        x:Name="BtnClientReport" x:FieldModifier="private"
-                        Content="{x:Static resx:Resources.genReport}"
-                        FontSize="18"
-                        Click="OnReportClicked"
-                        Grid.ColumnSpan="2"
-                        Margin="25,0,0,0" />
-            </Grid>
-            <Grid Width="300"
-                  Canvas.Left="15"
-                  Canvas.Top="110">
-                <Button Foreground="{DynamicResource buttonTextColor}"
-                        HorizontalAlignment="Center"
-                        Style="{StaticResource ButtonStyle}"
-                        Width="250"
-                        Height="40"
-                        x:Name="BtnRemoteSupport" x:FieldModifier="private"
-                        Tag="LABEL"
-                        Content="Remote Support"
-                        FontSize="18"
-                        Click="OnRemoteSupportClicked"
-                        Visibility="Visible" />
-            </Grid>
-            <Grid Panel.ZIndex="100"
-                  x:Name="PRGSGrid" x:FieldModifier="private"
-                  Visibility="Hidden"
-                  Canvas.Left="90"
-                  Canvas.Top="57">
-                <uctrl:CustomProgressBar x:Name="PRGS" x:FieldModifier="private"
-                                         Visibility="Visible"
-                                         Canvas.Left="300"
-                                         Width="150"
-                                         Height="25"
-                                         VerticalAlignment="Bottom" />
-                <TextBlock x:Name="PRGSText" x:FieldModifier="private"
-                           Text=""
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center" />
-            </Grid>
-            <Label x:Name="LblCustomerPanelVersion" x:FieldModifier="private"
-                   FontSize="12"
-                   Margin="115 205 0 0" />
-        </Canvas>
 
-        <Canvas Margin="150 0 0 0"
-                Canvas.Top="10"
-                x:Name="copied" x:FieldModifier="private"
-                Opacity="0"
-                Visibility="Collapsed">
-            <Border  BorderThickness="1"
-                     BorderBrush="{DynamicResource panelBorderColor}"
-                     CornerRadius="10"
-                     Background="{DynamicResource cardBackgroundColor}"
-                     Width="250"
-                     VerticalAlignment="Center"
-                     HorizontalAlignment="Center"
-                     Panel.ZIndex="100">
-                <TextBlock Text="{x:Static resx:Resources.copied}"
+        <Canvas x:Name="CanvasInfo"
+                Grid.Column="1"
+                Grid.ColumnSpan="2"
+                Grid.Row="0"
+                Height="560">
+            <Image Source="{DynamicResource appbar_information}"
+                   Width="36"
+                   Height="36"
+                   Margin="0,6,0,0"
+                   Tag="MAINICO" />
+            <Label Foreground="{DynamicResource sectionTitleColor}"
+                   Content="{x:Static resx:Resources.information}"
+                   FontSize="19"
+                   FontWeight="SemiBold"
+                   Canvas.Top="8"
+                   Canvas.Left="40" />
+
+            <StackPanel Canvas.Top="56"
+                        Canvas.Left="0"
+                        Width="350">
+                <Canvas Width="350"
+                        Height="54">
+                    <Image Source="{DynamicResource appbar_monitor}"
+                           Height="30"
+                           x:Name="icoComputer_Inline"
+                           x:FieldModifier="private" />
+                    <Label Foreground="{DynamicResource sectionTitleColor}"
+                           x:Name="LblComputername"
+                           x:FieldModifier="private"
+                           Content="{x:Static resx:Resources.computername}"
+                           FontSize="16"
+                           Canvas.Top="4"
+                           Canvas.Left="40" />
+                    <TextBox Canvas.Left="15"
+                             Width="300"
+                             Height="24"
+                             FontSize="16"
+                             VerticalAlignment="Center"
+                             Style="{StaticResource InfoTextBoxStyle}"
+                             x:Name="TxtComputername"
+                             x:FieldModifier="private"
+                             IsReadOnly="true"
+                             Canvas.Top="26"
+                             PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
+                    <Image Cursor="Hand"
+                           Source="{DynamicResource appbar_page_copy}"
+                           Height="22"
+                           x:Name="icoCopyComputer"
+                           x:FieldModifier="private"
+                           Tag="MAINICO"
+                           Canvas.Left="315"
+                           Canvas.Top="26"
+                           Width="24"
+                           PreviewMouseDown="ClickCopyIcon" />
+                </Canvas>
+
+                <Canvas Width="350"
+                        Height="54">
+                    <Image Source="{DynamicResource appbar_network}"
+                           Height="30"
+                           x:Name="icoNetwork_Inline"
+                           x:FieldModifier="private" />
+                    <Label Foreground="{DynamicResource sectionTitleColor}"
+                           FontSize="16"
+                           x:Name="LblIpaddress"
+                           x:FieldModifier="private"
+                           Content="{x:Static resx:Resources.ipaddress}"
+                           Canvas.Top="4"
+                           Canvas.Left="40" />
+                    <TextBox Canvas.Left="15"
+                             Width="300"
+                             Height="24"
+                             VerticalAlignment="Center"
+                             FontSize="16"
+                             Style="{StaticResource InfoTextBoxStyle}"
+                             x:Name="TxtIpaddress"
+                             x:FieldModifier="private"
+                             IsReadOnly="true"
+                             Canvas.Top="26"
+                             PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
+                    <Image Cursor="Hand"
+                           Source="{DynamicResource appbar_page_copy}"
+                           Height="22"
+                           x:Name="icoCopyNetwork"
+                           x:FieldModifier="private"
+                           Tag="MAINICO"
+                           Canvas.Left="315"
+                           Canvas.Top="26"
+                           Width="24"
+                           PreviewMouseDown="ClickCopyIcon" />
+                </Canvas>
+
+                <Canvas Width="350"
+                        Height="54"
+                        x:Name="CanvasHostname"
+                        x:FieldModifier="private">
+                    <Image Source="{DynamicResource appbar_remotehost}"
+                           Height="30"
+                           x:Name="icoHost_Inline"
+                           x:FieldModifier="private" />
+                    <Label Foreground="{DynamicResource sectionTitleColor}"
+                           x:Name="LblHostname"
+                           x:FieldModifier="private"
+                           Content="{x:Static resx:Resources.Hostname}"
+                           FontSize="16"
+                           Canvas.Top="4"
+                           Canvas.Left="40" />
+                    <TextBox Canvas.Left="15"
+                             Width="300"
+                             Height="24"
+                             FontSize="16"
+                             VerticalAlignment="Center"
+                             Style="{StaticResource InfoTextBoxStyle}"
+                             x:Name="TxtHostname"
+                             x:FieldModifier="private"
+                             IsReadOnly="true"
+                             Canvas.Top="26"
+                             PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
+                    <Image Cursor="Hand"
+                           Source="{DynamicResource appbar_page_copy}"
+                           Height="22"
+                           x:Name="icoCopyHost"
+                           x:FieldModifier="private"
+                           Tag="MAINICO"
+                           Canvas.Left="315"
+                           Canvas.Top="26"
+                           Width="24"
+                           PreviewMouseDown="ClickCopyIcon" />
+                </Canvas>
+
+                <Canvas Width="350"
+                        Height="54">
+                    <Image Source="{DynamicResource appbar_people}"
+                           Height="30"
+                           x:Name="icoUser_Inline"
+                           x:FieldModifier="private" />
+                    <Label Foreground="{DynamicResource sectionTitleColor}"
+                           FontSize="16"
+                           x:Name="LblUsername"
+                           x:FieldModifier="private"
+                           Content="{x:Static resx:Resources.username}"
+                           Canvas.Top="4"
+                           Canvas.Left="40" />
+                    <TextBox Canvas.Left="15"
+                             Width="300"
+                             Height="24"
+                             VerticalAlignment="Center"
+                             FontSize="16"
+                             Style="{StaticResource InfoTextBoxStyle}"
+                             x:Name="TxtUsername"
+                             x:FieldModifier="private"
+                             IsEnabled="true"
+                             IsReadOnly="true"
+                             Canvas.Top="26"
+                             PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
+                    <Image Cursor="Hand"
+                           Source="{DynamicResource appbar_page_copy}"
+                           Height="22"
+                           x:Name="icoCopyUser"
+                           x:FieldModifier="private"
+                           Tag="MAINICO"
+                           Canvas.Left="315"
+                           Canvas.Top="26"
+                           Width="24"
+                           PreviewMouseDown="ClickCopyIcon" />
+                </Canvas>
+
+                <Canvas Width="350"
+                        Height="54">
+                    <Image Source="{DynamicResource appbar_reset}"
+                           Height="30"
+                           x:Name="icoRestart_Inline"
+                           x:FieldModifier="private"
+                           Tag="MAINICO" />
+                    <Label Foreground="{DynamicResource sectionTitleColor}"
+                           FontSize="16"
+                           x:Name="LblLastreboot"
+                           x:FieldModifier="private"
+                           Content="{x:Static resx:Resources.lastreboot}"
+                           Canvas.Top="4"
+                           Canvas.Left="40" />
+                    <TextBox Canvas.Left="15"
+                             Width="300"
+                             Height="24"
+                             VerticalAlignment="Center"
+                             FontSize="16"
+                             Style="{StaticResource InfoTextBoxStyle}"
+                             x:Name="TxtLastreboot"
+                             x:FieldModifier="private"
+                             IsReadOnly="true"
+                             Canvas.Top="26"
+                             MouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
+                    <Image Cursor="Hand"
+                           Source="{DynamicResource appbar_page_copy}"
+                           Height="22"
+                           x:Name="icoCopyRestart"
+                           x:FieldModifier="private"
+                           Tag="MAINICO"
+                           Canvas.Left="315"
+                           Canvas.Top="26"
+                           Width="24"
+                           PreviewMouseDown="ClickCopyIcon" />
+                </Canvas>
+
+                <Canvas Width="350"
+                        Height="74">
+                    <Image Source="{DynamicResource appbar_folder_ellipsis}"
+                           Height="30"
+                           x:Name="icoDrive_Inline"
+                           x:FieldModifier="private"
+                           Tag="MAINICO" />
+                    <Label Foreground="{DynamicResource sectionTitleColor}"
+                           x:Name="LblDrives"
+                           x:FieldModifier="private"
+                           Content="{x:Static resx:Resources.drives}"
+                           FontSize="16"
+                           Canvas.Top="4"
+                           Canvas.Left="40" />
+                    <StackPanel Canvas.Left="15"
+                                Canvas.Top="28"
+                                Orientation="Vertical"
+                                Width="300">
+                        <StackPanel x:Name="StPaDrives"
+                                     x:FieldModifier="private"
+                                     Width="300"
+                                     CanHorizontallyScroll="True"
+                                     CanVerticallyScroll="True"
+                                     MinHeight="30"
+                                     MaxHeight="30"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Stretch"
+                                     Orientation="Horizontal" />
+                        <StackPanel x:Name="StPaDrives2"
+                                     x:FieldModifier="private"
+                                     Width="300"
+                                     CanHorizontallyScroll="True"
+                                     CanVerticallyScroll="True"
+                                     MinHeight="30"
+                                     MaxHeight="30"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Stretch"
+                                     Orientation="Horizontal" />
+                    </StackPanel>
+                </Canvas>
+
+                <Canvas Width="350"
+                        Height="130">
+                    <Label Content="{x:Static resx:Resources.genReportHeader}"
                            Foreground="{DynamicResource sectionTitleColor}"
-                           FontSize="15"
-                           Height="25"
-                           VerticalAlignment="Center"
-                           HorizontalAlignment="Center" />
-            </Border>
-        </Canvas>
+                           Canvas.Left="58"
+                           Canvas.Top="0"
+                           FontSize="16"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Top" />
+                    <Button Foreground="{DynamicResource buttonTextColor}"
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource ButtonStyle}"
+                            Width="250"
+                            Height="38"
+                            x:Name="BtnClientReport"
+                            x:FieldModifier="private"
+                            Content="{x:Static resx:Resources.genReport}"
+                            FontSize="16"
+                            Click="OnReportClicked"
+                            Canvas.Left="50"
+                            Canvas.Top="24" />
+                    <Button Foreground="{DynamicResource buttonTextColor}"
+                            HorizontalAlignment="Center"
+                            Style="{StaticResource ButtonStyle}"
+                            Width="250"
+                            Height="38"
+                            x:Name="BtnRemoteSupport"
+                            x:FieldModifier="private"
+                            Tag="LABEL"
+                            Content="Remote Support"
+                            FontSize="16"
+                            Click="OnRemoteSupportClicked"
+                            Visibility="Visible"
+                            Canvas.Left="50"
+                            Canvas.Top="70" />
+                    <Grid Panel.ZIndex="100"
+                          x:Name="PRGSGrid"
+                          x:FieldModifier="private"
+                          Visibility="Hidden"
+                          Canvas.Left="100"
+                          Canvas.Top="31">
+                        <uctrl:CustomProgressBar x:Name="PRGS"
+                                                 x:FieldModifier="private"
+                                                 Visibility="Visible"
+                                                 Width="150"
+                                                 Height="25"
+                                                 VerticalAlignment="Bottom" />
+                        <TextBlock x:Name="PRGSText"
+                                   x:FieldModifier="private"
+                                   Text=""
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center" />
+                    </Grid>
+                    <Label x:Name="LblCustomerPanelVersion"
+                           x:FieldModifier="private"
+                           FontSize="12"
+                           Canvas.Left="118"
+                           Canvas.Top="112" />
+                </Canvas>
+            </StackPanel>
 
+            <Canvas Canvas.Left="150"
+                    Canvas.Top="10"
+                    x:Name="copied"
+                    x:FieldModifier="private"
+                    Opacity="0"
+                    Visibility="Collapsed">
+                <Border BorderThickness="1"
+                         BorderBrush="{DynamicResource panelBorderColor}"
+                         CornerRadius="10"
+                         Background="{DynamicResource cardBackgroundColor}"
+                         Width="250"
+                         VerticalAlignment="Center"
+                         HorizontalAlignment="Center"
+                         Panel.ZIndex="100">
+                    <TextBlock Text="{x:Static resx:Resources.copied}"
+                               Foreground="{DynamicResource sectionTitleColor}"
+                               FontSize="15"
+                               Height="25"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center" />
+                </Border>
+            </Canvas>
+        </Canvas>
     </Grid>
     <!--ComputerInformation-->
 </UserControl>
diff --git a/UserControls/CustomLinks.xaml b/UserControls/CustomLinks.xaml
index a44588d..a42b775 100644
--- a/UserControls/CustomLinks.xaml
+++ b/UserControls/CustomLinks.xaml
@@ -9,20 +9,22 @@
              d:DesignHeight="450"
              d:DesignWidth="800">
 
-    <Grid Width="500"
-          Height="560">
+    <Grid Width="500">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
-            <ColumnDefinition Width="370*" />
+            <ColumnDefinition Width="185*" />
+            <ColumnDefinition Width="185*" />
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="110" />
-            <RowDefinition Height="450" />
+            <RowDefinition Height="6*" />
+            <RowDefinition Height="7*" />
         </Grid.RowDefinitions>
-        <Canvas Grid.Column="1"
+        <Canvas x:Name="CanvasLinks"
+                Grid.Column="1"
                 Grid.ColumnSpan="2"
-                Grid.Row="0">
+                Grid.Row="0"
+                Height="560">
             <Image Source="{DynamicResource appbar_star}"
                    Width="36"
                    Height="36"
@@ -34,15 +36,11 @@
                    Canvas.Top="8"
                    Canvas.Left="40"
                    Content="{x:Static resx:Resources.CustomLink}" />
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="2"
-                Grid.Row="1"
-                Height="450">
             <ScrollViewer Canvas.Top="56"
                           Canvas.Left="0"
-                          Width="350"
-                          Height="374"
+                          Width="{Binding ActualWidth, ElementName=CanvasLinks, Mode=OneWay}"
+                          MinHeight="60"
+                          MaxHeight="494"
                           HorizontalScrollBarVisibility="Disabled"
                           VerticalScrollBarVisibility="Auto">
                 <StackPanel x:Name="CustomLinkPanel"
diff --git a/UserControls/IncidentListItem.xaml b/UserControls/IncidentListItem.xaml
index f5d2c87..fd75b06 100644
--- a/UserControls/IncidentListItem.xaml
+++ b/UserControls/IncidentListItem.xaml
@@ -35,7 +35,7 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <DockPanel Margin="-10,0,0,0">
-                    <Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/>
+                    <Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="12" Height="12" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/>
                     <TextBlock  x:Name="txtTicketType"  Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="95"></TextBlock>
                 </DockPanel>
                 <DockPanel Grid.Column="1" Margin="10,0,0,0">
diff --git a/UserControls/PortalSearch.xaml b/UserControls/PortalSearch.xaml
index 683cfdf..ba275c8 100644
--- a/UserControls/PortalSearch.xaml
+++ b/UserControls/PortalSearch.xaml
@@ -74,10 +74,7 @@
     
     <Grid x:Name="GridSsp"
           x:FieldModifier="private"
-          Canvas.Left="0"
-          Width="500"
-          Height="560"
-          Canvas.Top="0">
+          Width="500">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
             <ColumnDefinition Width="185*" />
@@ -85,15 +82,15 @@
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="110" />
-            <RowDefinition Height="450" />
+            <RowDefinition Height="6*" />
+            <RowDefinition Height="7*" />
         </Grid.RowDefinitions>
         <Canvas x:Name="CanvasSearch"
                 x:FieldModifier="private"
                 Grid.Column="1"
                 Grid.ColumnSpan="2"
                 Grid.Row="0"
-                Height="70">
+                Height="560">
             <Image Source="{DynamicResource appbar_magnify}"
                    Width="36"
                    Height="36"
@@ -126,35 +123,35 @@
                        Cursor="Hand"
                        Visibility="Collapsed" />
             </StackPanel>
-        </Canvas>
-        <Canvas Grid.Column="1"
-                Grid.ColumnSpan="2"
-                Grid.Row="1"
-                Height="400">
-            <Button Style="{StaticResource ButtonStyle}"
-                    x:Name="BtnSspLink"
-                    x:FieldModifier="private"
-                    Width="320"
-                    Canvas.Left="15"
-                    Height="40"
-                    Content="Self Service Portal"
-                    FontSize="16"
-                    Canvas.Top="40"
-                    Click="OnSSPLinkClicked" />
-            <Button Foreground="{DynamicResource buttonTextColor}"
-                    x:Name="BtnMyserviceLink"
-                    x:FieldModifier="private"
-                    Style="{StaticResource ButtonStyle}"
-                    Width="320"
-                    Canvas.Left="15"
-                    Height="40"
-                    Content="{x:Static resx:Resources.myservices}"
-                    Tag="LABEL"
-                    FontSize="16"
-                    Canvas.Top="90"
-                    Click="OnMyServiceLinkClicked" />
-            <!--<Separator Canvas.Left="15" Width="320" Canvas.Top="140" Height="2" />-->
-            <!--<StackPanel x:Name="CustomLinkPanel" Orientation="Vertical" Canvas.Top="150"/>-->
+            <Canvas Canvas.Top="120"
+                    Canvas.Left="0"
+                    Width="350"
+                    Height="360">
+                <Button Style="{StaticResource ButtonStyle}"
+                        x:Name="BtnSspLink"
+                        x:FieldModifier="private"
+                        Width="320"
+                        Canvas.Left="15"
+                        Height="40"
+                        Content="Self Service Portal"
+                        FontSize="16"
+                        Canvas.Top="0"
+                        Click="OnSSPLinkClicked" />
+                <Button Foreground="{DynamicResource buttonTextColor}"
+                        x:Name="BtnMyserviceLink"
+                        x:FieldModifier="private"
+                        Style="{StaticResource ButtonStyle}"
+                        Width="320"
+                        Canvas.Left="15"
+                        Height="40"
+                        Content="{x:Static resx:Resources.myservices}"
+                        Tag="LABEL"
+                        FontSize="16"
+                        Canvas.Top="50"
+                        Click="OnMyServiceLinkClicked" />
+                <!--<Separator Canvas.Left="15" Width="320" Canvas.Top="140" Height="2" />-->
+                <!--<StackPanel x:Name="CustomLinkPanel" Orientation="Vertical" Canvas.Top="150"/>-->
+            </Canvas>
         </Canvas>
     </Grid>