diff --git a/UserControls/ComputerInformation.xaml b/UserControls/ComputerInformation.xaml
index 39ed421..f01f9fe 100644
--- a/UserControls/ComputerInformation.xaml
+++ b/UserControls/ComputerInformation.xaml
@@ -77,8 +77,9 @@
     <!--ComputerInformation-->
     <Grid x:Name="GridInfo" x:FieldModifier="private"
           Width="500"
-          Canvas.Left="512"
-          Canvas.Top="10">
+          Height="560"
+          Canvas.Left="0"
+          Canvas.Top="0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
             <ColumnDefinition Width="185*" />
@@ -87,14 +88,14 @@
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
-            <RowDefinition Height="7*" />
+            <RowDefinition Height="56" />
+            <RowDefinition Height="72" />
+            <RowDefinition Height="72" />
+            <RowDefinition Height="72" />
+            <RowDefinition Height="72" />
+            <RowDefinition Height="72" />
+            <RowDefinition Height="72" />
+            <RowDefinition Height="72" />
         </Grid.RowDefinitions>
         <Canvas Grid.Column="1"
                 Grid.ColumnSpan="3"
diff --git a/UserControls/CustomLinks.xaml b/UserControls/CustomLinks.xaml
index 98e08d0..a44588d 100644
--- a/UserControls/CustomLinks.xaml
+++ b/UserControls/CustomLinks.xaml
@@ -9,15 +9,16 @@
              d:DesignHeight="450"
              d:DesignWidth="800">
 
-    <Grid Width="500">
+    <Grid Width="500"
+          Height="560">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
             <ColumnDefinition Width="370*" />
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="6*" />
-            <RowDefinition Height="7*" />
+            <RowDefinition Height="110" />
+            <RowDefinition Height="450" />
         </Grid.RowDefinitions>
         <Canvas Grid.Column="1"
                 Grid.ColumnSpan="2"
@@ -36,11 +37,18 @@
         </Canvas>
         <Canvas Grid.Column="1"
                 Grid.ColumnSpan="2"
-                Grid.Row="1">
-            <StackPanel x:Name="CustomLinkPanel"
-                        x:FieldModifier="private"
-                        Orientation="Vertical"
-                        Canvas.Top="56" />
+                Grid.Row="1"
+                Height="450">
+            <ScrollViewer Canvas.Top="56"
+                          Canvas.Left="0"
+                          Width="350"
+                          Height="374"
+                          HorizontalScrollBarVisibility="Disabled"
+                          VerticalScrollBarVisibility="Auto">
+                <StackPanel x:Name="CustomLinkPanel"
+                            x:FieldModifier="private"
+                            Orientation="Vertical" />
+            </ScrollViewer>
         </Canvas>
     </Grid>
 </UserControl>
diff --git a/UserControls/PortalSearch.xaml b/UserControls/PortalSearch.xaml
index a095c73..683cfdf 100644
--- a/UserControls/PortalSearch.xaml
+++ b/UserControls/PortalSearch.xaml
@@ -74,9 +74,10 @@
     
     <Grid x:Name="GridSsp"
           x:FieldModifier="private"
-          Canvas.Left="1500"
+          Canvas.Left="0"
           Width="500"
-          Canvas.Top="10">
+          Height="560"
+          Canvas.Top="0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100*" />
             <ColumnDefinition Width="185*" />
@@ -84,8 +85,8 @@
             <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="6*" />
-            <RowDefinition Height="7*" />
+            <RowDefinition Height="110" />
+            <RowDefinition Height="450" />
         </Grid.RowDefinitions>
         <Canvas x:Name="CanvasSearch"
                 x:FieldModifier="private"
@@ -108,7 +109,7 @@
                    Canvas.Left="40" />
             <StackPanel Orientation="Horizontal"
                         Width="350"
-                        Canvas.Top="50"
+                        Canvas.Top="56"
                         Canvas.Left="0">
                 <TextBox x:Name="TxtSearchTerm"
                          x:FieldModifier="private"