diff --git a/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml b/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml
index 47ee688..90fa1e8 100644
--- a/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml
+++ b/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml
@@ -48,70 +48,126 @@
                        PopupAnimation="Fade">
                     <Border Width="{Binding ActualWidth, ElementName=HierarchySelector}"
                             Background="{DynamicResource BackgroundColor.Menu.SubCategory}"
-                            CornerRadius="7.5"
-                            Padding="10">
+                            BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
+                            BorderThickness="1"
+                            CornerRadius="12"
+                            Padding="14">
                         <Border.Effect>
-                            <DropShadowEffect BlurRadius="10"
+                            <DropShadowEffect BlurRadius="16"
                                               Color="{DynamicResource DropShadowColor.Menu}"
-                                              Direction="55"
-                                              ShadowDepth="10"
+                                              Direction="320"
+                                              ShadowDepth="8"
                                               Opacity="0.35" />
                         </Border.Effect>
-                        <StackPanel>
-                            <Grid Margin="0 0 10 0">
-                                <TextBox x:Name="PART_SearchTextBox"
-                                         Style="{DynamicResource Customizable.Editable.TextBox.EditOnly}"
-                                         Background="{TemplateBinding Background}"
-                                         Padding="27 5 5 5"
-                                         VerticalContentAlignment="Center" />
-                                <ico:AdaptableIcon SelectedInternIcon="menuBar_search"
-                                                   Style="{DynamicResource Menu.MenuBar.PinnedIcon.Base}"
-                                                   BorderPadding="5 5 5 7"
-                                                   Margin="0"
-                                                   IconBackgroundColor="Transparent"
-                                                   HorizontalAlignment="Left"
-                                                   VerticalAlignment="Center" />
-                                <TextBlock Margin="30 0 0 0"
-                                           Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Date}"
-                                           IsHitTestVisible="False"
-                                           VerticalAlignment="Center">
-                                    <TextBlock.Style>
-                                        <Style TargetType="TextBlock">
-                                            <Setter Property="Visibility" Value="Collapsed" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Text, ElementName=PART_SearchTextBox}"
-                                                             Value="">
-                                                    <Setter Property="Text"
-                                                            Value="{Binding Path=SearchPlaceholderText, RelativeSource={RelativeSource AncestorType={x:Type local:HierarchicalSelectionControl}}}" />
-                                                    <Setter Property="Visibility" Value="Visible" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </TextBlock.Style>
-                                </TextBlock>
-                            </Grid>
 
-                            <Border Margin="0 10 0 0"
-                                    Background="{DynamicResource BackgroundColor.Menu.SubCategory}"
-                                    BorderThickness="0"
-                                    CornerRadius="5">
-                                <ScrollViewer MaxHeight="300"
-                                              VerticalScrollBarVisibility="Auto">
+                        <StackPanel>
+                            <Border Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                    CornerRadius="8"
+                                    Padding="6 4"
+                                    Margin="0 0 0 12">
+                                <Grid>
+                                    <TextBox x:Name="PART_SearchTextBox"
+                                             Style="{DynamicResource Customizable.Editable.TextBox.EditOnly}"
+                                             Background="Transparent"
+                                             Padding="27 5 5 5"
+                                             BorderThickness="0"
+                                             VerticalContentAlignment="Center" />
+                                    <ico:AdaptableIcon SelectedInternIcon="menuBar_search"
+                                                       Style="{DynamicResource Menu.MenuBar.PinnedIcon.Base}"
+                                                       BorderPadding="5 5 5 7"
+                                                       Margin="0"
+                                                       IconBackgroundColor="Transparent"
+                                                       HorizontalAlignment="Left"
+                                                       VerticalAlignment="Center" />
+                                    <TextBlock Margin="30 0 0 0"
+                                               Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Date}"
+                                               IsHitTestVisible="False"
+                                               VerticalAlignment="Center">
+                                        <TextBlock.Style>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="Visibility" Value="Collapsed" />
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding Text, ElementName=PART_SearchTextBox}"
+                                                                 Value="">
+                                                        <Setter Property="Text"
+                                                                Value="{Binding Path=SearchPlaceholderText, RelativeSource={RelativeSource AncestorType={x:Type local:HierarchicalSelectionControl}}}" />
+                                                        <Setter Property="Visibility" Value="Visible" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </TextBlock.Style>
+                                    </TextBlock>
+                                </Grid>
+                            </Border>
+
+                            <Border Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                    CornerRadius="10"
+                                    Padding="4"
+                                    BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
+                                    BorderThickness="1">
+                                <ScrollViewer MaxHeight="320"
+                                              VerticalScrollBarVisibility="Auto"
+                                              Background="Transparent"
+                                              BorderThickness="0">
                                     <TreeView x:Name="PART_TreeView"
-                                              Background="{DynamicResource BackgroundColor.Menu.SubCategory}"
+                                              Background="Transparent"
+                                              BorderThickness="0"
+                                              HorizontalContentAlignment="Stretch"
                                               ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource TemplatedParent}}">
                                         <TreeView.Resources>
-                                            <Style TargetType="TreeViewItem">
+                                            <Style x:Key="HierarchyTreeViewItemStyle"
+                                                   TargetType="TreeViewItem"
+                                                   BasedOn="{StaticResource {x:Type TreeViewItem}}">
                                                 <Setter Property="IsExpanded"
                                                         Value="{Binding IsExpanded, Mode=TwoWay}" />
+                                                <Setter Property="Margin"
+                                                        Value="0,-1,0,1" />
+                                                <Setter Property="Padding"
+                                                        Value="0" />
                                             </Style>
+
                                             <HierarchicalDataTemplate DataType="{x:Type models:HierarchicalSelectionItem}"
                                                                       ItemsSource="{Binding Children}">
-                                                <TextBlock Text="{Binding DisplayName}"
-                                                           Foreground="{DynamicResource FontColor.Menu.Categories}"
-                                                           Margin="0 2 0 2" />
+                                                <Border x:Name="NodeContainer"
+                                                        Padding="10 4"
+                                                        Margin="2 1"
+                                                        Background="Transparent"
+                                                        CornerRadius="6"
+                                                        BorderBrush="Transparent"
+                                                        BorderThickness="1">
+                                                    <TextBlock x:Name="NodeText"
+                                                               Text="{Binding DisplayName}"
+                                                               Foreground="{DynamicResource FontColor.Menu.Categories}"
+                                                               FontSize="14" />
+                                                </Border>
+                                                <HierarchicalDataTemplate.Triggers>
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}, Path=IsMouseOver}"
+                                                                 Value="True">
+                                                        <Setter TargetName="NodeContainer"
+                                                                Property="Background"
+                                                                Value="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}" />
+                                                        <Setter TargetName="NodeText"
+                                                                Property="Foreground"
+                                                                Value="{DynamicResource FontColor.Menu.Categories.Hover}" />
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}, Path=IsSelected}"
+                                                                 Value="True">
+                                                        <Setter TargetName="NodeContainer"
+                                                                Property="Background"
+                                                                Value="{DynamicResource BackgroundColor.Menu.SubCategory}" />
+                                                        <Setter TargetName="NodeContainer"
+                                                                Property="BorderBrush"
+                                                                Value="{DynamicResource Color.FunctionMarker}" />
+                                                        <Setter TargetName="NodeText"
+                                                                Property="Foreground"
+                                                                Value="{DynamicResource FontColor.Menu.Categories}" />
+                                                    </DataTrigger>
+                                                </HierarchicalDataTemplate.Triggers>
                                             </HierarchicalDataTemplate>
                                         </TreeView.Resources>
+                                        <TreeView.ItemContainerStyle>
+                                            <StaticResource ResourceKey="HierarchyTreeViewItemStyle" />
+                                        </TreeView.ItemContainerStyle>
                                     </TreeView>
                                 </ScrollViewer>
                             </Border>