diff --git a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
index 9e9c62b3..4a9f08d0 100644
--- a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
@@ -42,43 +42,65 @@
             </Grid.ColumnDefinitions>
 
             <!-- Row 0 -->
-            <StackPanel Name="TimeTableAppPanel" Grid.Row="0" Grid.Column="0">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.TimeTableApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="LectureAppPanel" Grid.Row="0" Grid.Column="1">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="NewsAppPanel" Grid.Row="0" Grid.Column="2" >
-                <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
-                <TextBlock Text="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
+            <Button Name="TimeTableAppButton" Grid.Row="0" Grid.Column="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.TimeTableApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="LectureAppButton" Grid.Row="0" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="NewsAppButton" Grid.Row="0" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
+                    <TextBlock Text="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
 
             <!-- Row 1 -->
-            <StackPanel Name="MensaAppPanel" Grid.Row="1" Grid.Column="0">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="CampusMapAppPanel" Grid.Row="1" Grid.Column="1">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.CampusMapApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="HomeworkAppPanel" Grid.Row="1" Grid.Column="2">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.HomeworkApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
+            <Button Name="MensaAppButton" Grid.Row="1" Grid.Column="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="CampusMapAppButton" Grid.Row="1" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.CampusMapApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="HomeworkAppButton" Grid.Row="1" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.HomeworkApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
 
             <!-- Row 2 -->
-            <StackPanel Name="DepartmentAppPanel" Grid.Row="2" Grid.Column="0">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.DepartmentApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="EventAppPanel" Grid.Row="2" Grid.Column="1">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.EventApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <Button Name="MailAppPanel" Grid.Row="2" Grid.Column="2"  Click="Button_Click" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+            <Button Name="DepartmentAppButton" Grid.Row="2" Grid.Column="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel  Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.DepartmentApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button  Name="EventAppButton" Grid.Row="2" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel  Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.EventApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="MailAppButton" Grid.Row="2" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
                 <StackPanel Height="auto" Margin="-12,-12,-12,-12">
                     <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
                     <TextBlock Text="{Binding Path=LocalizedResources.MailApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
@@ -86,18 +108,26 @@
             </Button>
 
             <!-- Row 3 -->
-            <StackPanel Name="OpenHoursAppPanel" Grid.Row="3" Grid.Column="0" >
-                <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
-                <TextBlock Text="{Binding Path=LocalizedResources.OpenHoursApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="OSAAppPanel" Grid.Row="3" Grid.Column="1">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.OSAApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
-            <StackPanel Name="LinkAppPanel" Grid.Row="3" Grid.Column="2">
-                <Image Source="/Assets/ApplicationIcon.png" Height="100" />
-                <TextBlock Text="{Binding Path=LocalizedResources.LinkApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
-            </StackPanel>
+            <Button Name="OpenHoursAppButton" Grid.Row="3" Grid.Column="0"  BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100"/>
+                    <TextBlock Text="{Binding Path=LocalizedResources.OpenHoursApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="OSAAppButton" Grid.Row="3" Grid.Column="1" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.OSAApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
+
+            <Button Name="LinkAppButton" Grid.Row="3" Grid.Column="2" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                <StackPanel Height="auto" Margin="-12,-12,-12,-12">
+                    <Image Source="/Assets/ApplicationIcon.png" Height="100" />
+                    <TextBlock Text="{Binding Path=LocalizedResources.LinkApp_Title, Source={StaticResource LocalizedStrings}}" Height="Auto" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </StackPanel>
+            </Button>
         </Grid>
 
         <!--      <Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" /> -->
diff --git a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
index e18bb3ab..5dcb70ba 100644
--- a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
@@ -23,39 +23,31 @@ namespace CampusAppWP8.pages
             // Switch the placement of the buttons based on an orientation change.
             if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight)
             {
-                OpenHoursAppPanel.SetValue(Grid.RowProperty, 0);
-                OpenHoursAppPanel.SetValue(Grid.ColumnProperty, 3);
+                OpenHoursAppButton.SetValue(Grid.RowProperty, 0);
+                OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3);
 
-                OSAAppPanel.SetValue(Grid.RowProperty, 1);
-                OSAAppPanel.SetValue(Grid.ColumnProperty, 3);
+                OSAAppButton.SetValue(Grid.RowProperty, 1);
+                OSAAppButton.SetValue(Grid.ColumnProperty, 3);
 
-                LinkAppPanel.SetValue(Grid.RowProperty, 2);
-                LinkAppPanel.SetValue(Grid.ColumnProperty, 3);
+                LinkAppButton.SetValue(Grid.RowProperty, 2);
+                LinkAppButton.SetValue(Grid.ColumnProperty, 3);
                 ContentPanel.Margin = new Thickness(12, -24, 0, 0);
           
             }
             // If not in portrait, move buttonList content to visible row and column.
             else
             {
-                OpenHoursAppPanel.SetValue(Grid.RowProperty, 3);
-                OpenHoursAppPanel.SetValue(Grid.ColumnProperty, 0);
+                OpenHoursAppButton.SetValue(Grid.RowProperty, 3);
+                OpenHoursAppButton.SetValue(Grid.ColumnProperty, 0);
 
-                OSAAppPanel.SetValue(Grid.RowProperty, 3);
-                OSAAppPanel.SetValue(Grid.ColumnProperty, 1);
+                OSAAppButton.SetValue(Grid.RowProperty, 3);
+                OSAAppButton.SetValue(Grid.ColumnProperty, 1);
 
-                LinkAppPanel.SetValue(Grid.RowProperty, 3);
-                LinkAppPanel.SetValue(Grid.ColumnProperty, 2);
+                LinkAppButton.SetValue(Grid.RowProperty, 3);
+                LinkAppButton.SetValue(Grid.ColumnProperty, 2);
                 ContentPanel.Margin = new Thickness(12, 0, 0, 0);
 
             }
         }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            Microsoft.Phone.Tasks.WebBrowserTask wbt = new Microsoft.Phone.Tasks.WebBrowserTask();
-            wbt.Uri = new Uri("https://webmail.tu-cottbus.de");
-            wbt.Show();
-        }
-
     }
 }
\ No newline at end of file