diff --git a/DerpingDrivers/App.xaml b/DerpingDrivers/App.xaml
index e6afd74..c61f9c8 100644
--- a/DerpingDrivers/App.xaml
+++ b/DerpingDrivers/App.xaml
@@ -13,6 +13,7 @@
                 <!-- Accent and AppTheme setting -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedTabControl.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="Label">
                 <Setter Property="FontFamily" Value="Segoe UI Light"/>
diff --git a/DerpingDrivers/DerpingDrivers.csproj b/DerpingDrivers/DerpingDrivers.csproj
index aeb3348..c0d5e8e 100644
--- a/DerpingDrivers/DerpingDrivers.csproj
+++ b/DerpingDrivers/DerpingDrivers.csproj
@@ -41,6 +41,9 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>favicon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
@@ -129,6 +132,9 @@
   <ItemGroup>
     <Resource Include="FodyWeavers.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="favicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.3.2.13\build\Fody.targets" Condition="Exists('..\packages\Fody.3.2.13\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/DerpingDrivers/MainWindow.xaml b/DerpingDrivers/MainWindow.xaml
index 64c3b26..3610519 100644
--- a/DerpingDrivers/MainWindow.xaml
+++ b/DerpingDrivers/MainWindow.xaml
@@ -7,7 +7,7 @@
                       xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
                       mc:Ignorable="d"
                       Title="Derping Drivers - Windows driver settings detection tool"
-                      Height="600" Width="700"
+                      Height="360" Width="700"
                       ShowMaxRestoreButton="False"
                       ResizeMode="NoResize"
                       WindowStartupLocation="CenterScreen"
@@ -15,13 +15,9 @@
                       BorderThickness="0"
                       GlowBrush="{DynamicResource AccentColorBrush}"
                       DataContext="{Binding RelativeSource={RelativeSource Self}}">
-    <Grid Margin="15">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <GroupBox Grid.Row="0" Header="System details">
+    <TabControl Margin="15">
+        <!-- System Details -->
+        <TabItem Header="System Details">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -29,6 +25,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
@@ -57,10 +54,17 @@
                 <Label Grid.Row="5" Grid.Column="2" Content="{Binding Path=OsUpgradeStatus}" />
 
             </Grid>
-        </GroupBox>
+        </TabItem>
+        
+        <!-- Compatibility Summary -->
+        <TabItem Header="Compatibility Summary">
+            <FlowDocumentScrollViewer VerticalScrollBarVisibility="Auto" Document="{Binding SummaryDocument}"/>
+        </TabItem>
+        
+        <!-- About -->
+        <TabItem Header="About">
+            <Label>Made by Benjamin Höglinger-Stelzer</Label>
+        </TabItem>
+    </TabControl>
 
-        <GroupBox Grid.Row="1" Margin="0,15,0,0" Header="Device Driver Compatibility Summary">
-            <FlowDocumentScrollViewer Height="200" VerticalScrollBarVisibility="Auto" Document="{Binding SummaryDocument}"/>
-        </GroupBox>
-    </Grid>
 </controls:MetroWindow>
\ No newline at end of file
diff --git a/DerpingDrivers/favicon.ico b/DerpingDrivers/favicon.ico
new file mode 100644
index 0000000..5774b5c
Binary files /dev/null and b/DerpingDrivers/favicon.ico differ
diff --git a/DerpingDrivers/favicon.png b/DerpingDrivers/favicon.png
new file mode 100644
index 0000000..7be50df
Binary files /dev/null and b/DerpingDrivers/favicon.png differ
diff --git a/README.md b/README.md
index d7dfddc..8849abf 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,5 @@
 
 ## Sources
 
+- Icon by [Rebin Infotech](https://www.iconfinder.com/rebininfotech)
 - [Getting Operating System Version Info - Even for Windows 10!](<https://www.codeproject.com/Articles/73000/Getting-Operating-System-Version-Info-Even-for-Win>)
\ No newline at end of file