diff --git a/Stars Assistant/App.axaml b/Stars Assistant/App.axaml
index d378de6..d4c757b 100644
--- a/Stars Assistant/App.axaml	
+++ b/Stars Assistant/App.axaml	
@@ -10,7 +10,7 @@
     </Application.DataTemplates>
   
     <Application.Styles>
-        <FluentTheme />
+        <FluentTheme DensityStyle="Compact" />
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Stars Assistant/Stars Assistant.csproj b/Stars Assistant/Stars Assistant.csproj
index 6c2c0b2..0437e7c 100644
--- a/Stars Assistant/Stars Assistant.csproj	
+++ b/Stars Assistant/Stars Assistant.csproj	
@@ -11,11 +11,9 @@
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
   
-  <!-- PropertyGroup>
-    <OutputType>WinExe</OutputType>
-  </PropertyGroup -->
-
-
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
diff --git a/Stars Assistant/Views/MainWindow.axaml b/Stars Assistant/Views/MainWindow.axaml
index 4323b39..b906a4a 100644
--- a/Stars Assistant/Views/MainWindow.axaml	
+++ b/Stars Assistant/Views/MainWindow.axaml	
@@ -6,6 +6,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="net.nehmer.sa.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
+        Icon="/Assets/avalonia-logo.ico"
         Title="GetStartedApp">
 
         <!-- Icon="/Assets/avalonia-logo.ico" -->
@@ -16,37 +17,43 @@
         <vm:MainWindowViewModel/>
     </Design.DataContext>
 
-    <StackPanel>
-        <Border Margin="5" CornerRadius="10" Background="LightBlue">
-            <TextBlock Margin="5" FontSize="24" HorizontalAlignment="Center" Text="{Binding Greeting}"></TextBlock>
-        </Border>
-        <Grid ShowGridLines="True" Margin="5" ColumnDefinitions="120, 100" RowDefinitions="Auto, Auto, Auto">  
-            <Label Grid.Row="0" Grid.Column="0" Margin="10">Celsius</Label>
-            <TextBox Grid.Row="0" Grid.Column="1" Margin="0 5" Text="0" Name="celsius"/>
-            <Label Grid.Row="1" Grid.Column="0" Margin="10">Fahrenheit</Label>
-            <TextBox Grid.Row="1"  Grid.Column="1" Margin="0 5" Text="0" Name="fahrenheit"/>
-            <Button Grid.Row="2" Grid.Column="1" Margin="0 5" Click="ButtonClicked">Calculate</Button>
-        </Grid>
-        <DataGrid Margin="20" ItemsSource="{Binding Planets}"   
-            AutoGenerateColumns="True" IsReadOnly="True" 
-            GridLinesVisibility="All"
-            BorderThickness="1" BorderBrush="Gray">
-        </DataGrid>
-
-        <!-- ScrollViewer>
-            <ItemsControl ItemsSource="{Binding Planets}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate DataType="vm:PlanetViewModel">
-                        <Grid ColumnDefinitions="200, 100, 50">
-                            <TextBlock Grid.Column="0" Text="{Binding Name}"/>
-                            <TextBlock Grid.Column="1" Text="{Binding Owner}"/>
-                            <TextBlock Grid.Column="2" Text="{Binding Value}"/>
-                        </Grid>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer-->
-
-  </StackPanel>
-
+    <TabControl>
+        <TabItem Header="Home">
+            <StackPanel>
+                <Border Margin="5" CornerRadius="10" Background="LightBlue">
+                    <TextBlock Margin="5" FontSize="24" HorizontalAlignment="Center" Text="{Binding Greeting}"></TextBlock>
+                </Border>
+                <Grid ShowGridLines="True" Margin="5" ColumnDefinitions="120, 100" RowDefinitions="Auto, Auto, Auto">  
+                    <Label Grid.Row="0" Grid.Column="0" Margin="10">Celsius</Label>
+                    <TextBox Grid.Row="0" Grid.Column="1" Margin="0 5" Text="0" Name="celsius"/>
+                    <Label Grid.Row="1" Grid.Column="0" Margin="10">Fahrenheit</Label>
+                    <TextBox Grid.Row="1"  Grid.Column="1" Margin="0 5" Text="0" Name="fahrenheit"/>
+                    <Button Grid.Row="2" Grid.Column="1" Margin="0 5" Click="ButtonClicked">Calculate</Button>
+                </Grid>
+            </StackPanel>
+        </TabItem>
+        <TabItem Header="DataGrid">
+            <DataGrid ItemsSource="{Binding Planets}"   
+                AutoGenerateColumns="True" IsReadOnly="True" 
+                GridLinesVisibility="All"
+                FrozenColumnCount="1"
+                BorderThickness="1" BorderBrush="Gray">
+            </DataGrid>
+        </TabItem>
+        <TabItem Header="ScrollViewer">
+            <ScrollViewer>
+                <ItemsControl ItemsSource="{Binding Planets}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate DataType="vm:PlanetViewModel">
+                            <Grid ColumnDefinitions="200, 100, 50">
+                                <TextBlock Grid.Column="0" Text="{Binding Name}"/>
+                                <TextBlock Grid.Column="1" Text="{Binding Owner}"/>
+                                <TextBlock Grid.Column="2" Text="{Binding Value}"/>
+                            </Grid>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </TabItem>
+    </TabControl>
 </Window>