diff --git a/K8sFileBrowser/Models/FileInformation.cs b/K8sFileBrowser/Models/FileInformation.cs
index ca9105a..8e34a1b 100644
--- a/K8sFileBrowser/Models/FileInformation.cs
+++ b/K8sFileBrowser/Models/FileInformation.cs
@@ -6,6 +6,7 @@ public class FileInformation
 {
     public string Parent { get; set; } = string.Empty;
     public FileType Type { get; set; } = FileType.File;
+    public string DisplayName => Parent.Length < 2 ? Name[Parent.Length..] : Name[( Parent.Length + 1)..];
     public string Name { get; set; } = string.Empty;
     public string Size { get; set; } = string.Empty;
     public DateTimeOffset Date { get; set; } = DateTimeOffset.MinValue;
diff --git a/K8sFileBrowser/Views/MainWindow.axaml b/K8sFileBrowser/Views/MainWindow.axaml
index cba93aa..f993b96 100644
--- a/K8sFileBrowser/Views/MainWindow.axaml
+++ b/K8sFileBrowser/Views/MainWindow.axaml
@@ -8,12 +8,11 @@
         x:Class="K8sFileBrowser.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
         Icon="/Assets/app.ico"
-        Title="K8sFileBrowser"
-        DataContext="{DynamicResource ViewModel}">
-        
-    <Window.Resources>
-        <vm:MainWindowViewModel x:Key="ViewModel" />
-    </Window.Resources>
+        Title="K8sFileBrowser">
+
+    <Design.DataContext>
+        <vm:MainWindowViewModel />
+    </Design.DataContext>
 
     <Grid>
         <Border ZIndex="1" IsVisible="{Binding Message.IsVisible}" Background="{Binding Message.Color}" Opacity="{Binding Message.Opacity}">
@@ -116,24 +115,63 @@
                     <DataGridTemplateColumn Header="Type">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate DataType="models:FileInformation">
-                                <Border ToolTip.Tip="{Binding Type}" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                    <StackPanel>
+                                <Border ToolTip.Tip="{Binding Type}" Background="Transparent">
+                                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                         <PathIcon Data="{StaticResource folder_regular}" IsVisible="{Binding IsDirectory}"></PathIcon>
                                         <PathIcon Data="{StaticResource document_regular}" IsVisible="{Binding IsFile}"></PathIcon>
                                         <PathIcon Data="{StaticResource document_unknown_regular}" IsVisible="{Binding IsUnknown}"></PathIcon>
                                     </StackPanel>
                                     <Interaction.Behaviors>
                                         <EventTriggerBehavior EventName="DoubleTapped">
-                                            <InvokeCommandAction Command="{Binding Source={StaticResource ViewModel}, Path=OpenCommand}" />
+                                            <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
+                                        </EventTriggerBehavior>
+                                    </Interaction.Behaviors>
+                                </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="Name" Width="*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate DataType="models:FileInformation">
+                                <Border Background="Transparent">
+                                    <TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center"/>
+                                    <Interaction.Behaviors>
+                                        <EventTriggerBehavior EventName="DoubleTapped">
+                                            <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
+                                        </EventTriggerBehavior>
+                                    </Interaction.Behaviors>
+                                </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="Size" Width="*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate DataType="models:FileInformation">
+                                <Border Background="Transparent">
+                                    <TextBlock Text="{Binding Size}" VerticalAlignment="Center"/>
+                                    <Interaction.Behaviors>
+                                        <EventTriggerBehavior EventName="DoubleTapped">
+                                            <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
+                                        </EventTriggerBehavior>
+                                    </Interaction.Behaviors>
+                                </Border>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTemplateColumn Header="Date" Width="*">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate DataType="models:FileInformation">
+                                <Border Background="Transparent">
+                                    <TextBlock Text="{Binding Date}" VerticalAlignment="Center"/>
+                                    <Interaction.Behaviors>
+                                        <EventTriggerBehavior EventName="DoubleTapped">
+                                            <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
                                         </EventTriggerBehavior>
                                     </Interaction.Behaviors>
                                 </Border>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTextColumn Header="Name" Width="*" Binding="{Binding Name}" />
-                    <DataGridTextColumn Header="Size" Binding="{Binding Size}" />
-                    <DataGridTextColumn Header="Date" Binding="{Binding Date}" />
                 </DataGrid.Columns>
             </DataGrid>
             </Grid>