diff --git a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.cpp b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.cpp
index 9f1b94317e..f47cad7555 100644
--- a/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.cpp
+++ b/src/modules/powerrename/PowerRenameUIHost/PowerRenameUIHost.cpp
@@ -134,6 +134,7 @@ bool AppWindow::OnCreate(HWND, LPCREATESTRUCT) noexcept
     try
     {
         PopulateExplorerItems();
+        UpdateCounts();
         SetHandlers();
         ReadSettings();
     }
@@ -246,11 +247,6 @@ void AppWindow::PopulateExplorerItems()
     m_prManager->GetVisibleItemCount(&count);
     Logger::debug(L"Number of visible items: {}", count);
 
-    UINT currDepth = 0;
-    std::stack<UINT> parents{};
-    UINT prevId = 0;
-    parents.push(0);
-
     for (UINT i = 0; i < count; ++i)
     {
         CComPtr<IPowerRenameItem> renameItem;
@@ -274,23 +270,8 @@ void AppWindow::PopulateExplorerItems()
             bool isSubFolderContent = false;
             winrt::check_hresult(renameItem->GetIsFolder(&isFolder));
 
-            if (depth > currDepth)
-            {
-                parents.push(prevId);
-                currDepth = depth;
-            }
-            else
-            {
-                while (currDepth > depth)
-                {
-                    parents.pop();
-                    currDepth--;
-                }
-                currDepth = depth;
-            }
             m_mainUserControl.AddExplorerItem(
-                id, originalName, newName == nullptr ? hstring{} : hstring{ newName }, isFolder ? 0 : 1, parents.top(), selected);
-            prevId = id;
+                id, originalName, newName == nullptr ? hstring{} : hstring{ newName }, isFolder ? 0 : 1, depth, selected);
         }
     }
 }
@@ -638,6 +619,7 @@ void AppWindow::SwitchView()
 
     m_prManager->SwitchFilter(0);
     PopulateExplorerItems();
+    UpdateCounts();
 }
 
 void AppWindow::Rename(bool closeWindow)
@@ -851,11 +833,12 @@ void AppWindow::UpdateCounts()
         m_selectedCount = selectedCount;
         m_renamingCount = renamingCount;
 
-        // Update counts UI elements if/when added
-
         // Update Rename button state
         m_mainUserControl.UIUpdatesItem().ButtonRenameEnabled(renamingCount > 0);
     }
+
+    m_mainUserControl.UIUpdatesItem().OriginalCount(std::to_wstring(m_mainUserControl.ExplorerItems().Size()));
+    m_mainUserControl.UIUpdatesItem().RenamedCount(std::to_wstring(m_renamingCount));
 }
 
 HRESULT AppWindow::OnItemAdded(_In_ IPowerRenameItem* renameItem)
@@ -878,7 +861,6 @@ HRESULT AppWindow::OnUpdate(_In_ IPowerRenameItem* renameItem)
         }
     }
 
-    UpdateCounts();
     return S_OK;
 }
 
@@ -935,6 +917,7 @@ HRESULT AppWindow::OnRegExCompleted(_In_ DWORD threadId)
         }
     }
 
+    UpdateCounts();
     return S_OK;
 }
 
diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp b/src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp
index 8897dc9039..2e6b1d7e29 100644
--- a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp
+++ b/src/modules/powerrename/PowerRenameUILib/ExplorerItem.cpp
@@ -2,15 +2,17 @@
 #include "ExplorerItem.h"
 #include "ExplorerItem.g.cpp"
 
+namespace {
+    const wchar_t fileImagePath[] = L"ms-appx:///Assets/file.png";
+    const wchar_t folderImagePath[] = L"ms-appx:///Assets/folder.png";
+}
+
 namespace winrt::PowerRenameUILib::implementation
 {
-    ExplorerItem::ExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, bool checked) :
-        m_id{ id }, m_idStr{ std::to_wstring(id) }, m_original{ original }, m_renamed{ renamed }, m_type{ type }, m_checked{ checked }
+    ExplorerItem::ExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, uint32_t depth, bool checked) :
+        m_id{ id }, m_idStr{ std::to_wstring(id) }, m_original{ original }, m_renamed{ renamed }, m_type{ type }, m_depth{ depth }, m_checked{ checked }
     {
-        if (m_type == static_cast<UINT>(ExplorerItemType::Folder))
-        {
-            m_children = winrt::single_threaded_observable_vector<PowerRenameUILib::ExplorerItem>();
-        }
+        m_imagePath = (m_type == static_cast<UINT>(ExplorerItemType::Folder)) ? folderImagePath : fileImagePath;
     }
 
     int32_t ExplorerItem::Id()
@@ -51,6 +53,15 @@ namespace winrt::PowerRenameUILib::implementation
         }
     }
 
+    double ExplorerItem::Indentation() {
+        return static_cast<double>(m_depth) * 12;
+    }
+
+    hstring ExplorerItem::ImagePath()
+    {
+        return m_imagePath;
+    }
+
     int32_t ExplorerItem::Type()
     {
         return m_type;
@@ -79,20 +90,6 @@ namespace winrt::PowerRenameUILib::implementation
         }
     }
 
-    winrt::Windows::Foundation::Collections::IObservableVector<winrt::PowerRenameUILib::ExplorerItem> ExplorerItem::Children()
-    {
-        return m_children;
-    }
-
-    void ExplorerItem::Children(Windows::Foundation::Collections::IObservableVector<PowerRenameUILib::ExplorerItem> const& value)
-    {
-        if (m_children != value)
-        {
-            m_children = value;
-            m_propertyChanged(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"Children" });
-        }
-    }
-
     winrt::event_token ExplorerItem::PropertyChanged(winrt::Windows::UI::Xaml::Data::PropertyChangedEventHandler const& handler)
     {
         return m_propertyChanged.add(handler);
diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.h b/src/modules/powerrename/PowerRenameUILib/ExplorerItem.h
index f1d97d80ed..b16f0c6427 100644
--- a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.h
+++ b/src/modules/powerrename/PowerRenameUILib/ExplorerItem.h
@@ -11,15 +11,17 @@ namespace winrt::PowerRenameUILib::implementation
             File = 1
         };
         
-        ExplorerItem() = delete;
+        ExplorerItem() = default;
 
-        ExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, bool checked);
+        ExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, uint32_t depth, bool checked);
         int32_t Id();
         hstring IdStr();
         hstring Original();
         void Original(hstring const& value);
         hstring Renamed();
         void Renamed(hstring const& value);
+        double Indentation();
+        hstring ImagePath();
         int32_t Type();
         void Type(int32_t value);
         bool Checked();
@@ -34,6 +36,8 @@ namespace winrt::PowerRenameUILib::implementation
         hstring m_idStr;
         winrt::hstring m_original;
         winrt::hstring m_renamed;
+        uint32_t m_depth;
+        hstring m_imagePath;
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUILib::ExplorerItem> m_children;
         int32_t m_type;
         bool m_checked;
diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.idl b/src/modules/powerrename/PowerRenameUILib/ExplorerItem.idl
index c628b2af6c..c83dbf7add 100644
--- a/src/modules/powerrename/PowerRenameUILib/ExplorerItem.idl
+++ b/src/modules/powerrename/PowerRenameUILib/ExplorerItem.idl
@@ -2,13 +2,15 @@ namespace PowerRenameUILib
 {
     runtimeclass ExplorerItem : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
-        ExplorerItem(Int32 id, String original, String renamed, Int32 type, Boolean checked);
+        ExplorerItem();
+        ExplorerItem(Int32 id, String original, String renamed, Int32 type, UInt32 depth, Boolean checked);
         Int32 Id { get; };
         String IdStr { get; };
         String Original;
         String Renamed;
+        Double Indentation { get; };
+        String ImagePath { get; };
         Int32 Type;
         Boolean Checked;
-        Windows.Foundation.Collections.IObservableVector<ExplorerItem> Children;
     }
 }
diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.cpp b/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.cpp
deleted file mode 100644
index 500c7eb3df..0000000000
--- a/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "pch.h"
-#include "ExplorerItemTemplateSelector.h"
-#include "ExplorerItemTemplateSelector.g.cpp"
-
-namespace winrt::PowerRenameUILib::implementation
-{
-    Windows::UI::Xaml::DataTemplate ExplorerItemTemplateSelector::SelectTemplateCore(IInspectable const& item)
-    {
-        ExplorerItem explorerItem = (ExplorerItem&)item;
-        return explorerItem.Type() == 0 ? m_folderTemplate : m_fileTemplate;
-    }
-
-    Windows::UI::Xaml::DataTemplate ExplorerItemTemplateSelector::SelectTemplateCore(IInspectable const&, Windows::UI::Xaml::DependencyObject const&)
-    {
-        return Windows::UI::Xaml::DataTemplate();
-    }
-
-    winrt::Windows::UI::Xaml::DataTemplate ExplorerItemTemplateSelector::FolderTemplate()
-    {
-        return m_folderTemplate;
-    }
-
-    void ExplorerItemTemplateSelector::FolderTemplate(winrt::Windows::UI::Xaml::DataTemplate const& value)
-    {
-        m_folderTemplate = value;
-    }
-
-    winrt::Windows::UI::Xaml::DataTemplate ExplorerItemTemplateSelector::FileTemplate()
-    {
-        return m_fileTemplate;
-    }
-
-    void ExplorerItemTemplateSelector::FileTemplate(winrt::Windows::UI::Xaml::DataTemplate const& value)
-    {
-        m_fileTemplate = value;
-    }
-}
diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.h b/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.h
deleted file mode 100644
index 35c46638a2..0000000000
--- a/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include "ExplorerItemTemplateSelector.g.h"
-
-namespace winrt::PowerRenameUILib::implementation
-{
-    struct ExplorerItemTemplateSelector : ExplorerItemTemplateSelectorT<ExplorerItemTemplateSelector>
-    {
-        ExplorerItemTemplateSelector() = default;
-
-        Windows::UI::Xaml::DataTemplate SelectTemplateCore(IInspectable const&);
-        Windows::UI::Xaml::DataTemplate SelectTemplateCore(IInspectable const&, Windows::UI::Xaml::DependencyObject const&);
-
-        winrt::Windows::UI::Xaml::DataTemplate FolderTemplate();
-        void FolderTemplate(winrt::Windows::UI::Xaml::DataTemplate const& value);
-        winrt::Windows::UI::Xaml::DataTemplate FileTemplate();
-        void FileTemplate(winrt::Windows::UI::Xaml::DataTemplate const& value);
-
-    private:
-        Windows::UI::Xaml::DataTemplate m_folderTemplate{ nullptr };
-        Windows::UI::Xaml::DataTemplate m_fileTemplate{ nullptr };
-    };
-}
-namespace winrt::PowerRenameUILib::factory_implementation
-{
-    struct ExplorerItemTemplateSelector : ExplorerItemTemplateSelectorT<ExplorerItemTemplateSelector, implementation::ExplorerItemTemplateSelector>
-    {
-    };
-}
diff --git a/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.idl b/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.idl
deleted file mode 100644
index f31cf94294..0000000000
--- a/src/modules/powerrename/PowerRenameUILib/ExplorerItemTemplateSelector.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace PowerRenameUILib
-{
-    [bindable]
-        [default_interface] runtimeclass ExplorerItemTemplateSelector : Windows.UI.Xaml.Controls.DataTemplateSelector
-    {
-        ExplorerItemTemplateSelector();
-
-        Windows.UI.Xaml.DataTemplate FolderTemplate;
-        Windows.UI.Xaml.DataTemplate FileTemplate;
-    }
-}
diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.cpp b/src/modules/powerrename/PowerRenameUILib/MainWindow.cpp
index d6c82b9fd2..8ca0d2e6af 100644
--- a/src/modules/powerrename/PowerRenameUILib/MainWindow.cpp
+++ b/src/modules/powerrename/PowerRenameUILib/MainWindow.cpp
@@ -163,18 +163,11 @@ namespace winrt::PowerRenameUILib::implementation
         return m_uiUpdatesItem;
     }
 
-    void MainWindow::AddExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, int32_t parentId, bool checked)
+    void MainWindow::AddExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, uint32_t depth, bool checked)
     {
-        auto newItem = winrt::make<PowerRenameUILib::implementation::ExplorerItem>(id, original, renamed, type, checked);
-        if (parentId == 0)
-        {
-            m_explorerItems.Append(newItem);
-        }
-        else
-        {
-            auto parent = FindById(parentId);
-            parent.Children().Append(newItem);
-        }
+        auto newItem = winrt::make<PowerRenameUILib::implementation::ExplorerItem>(id, original, renamed, type, depth, checked);
+        m_explorerItems.Append(newItem);
+        m_explorerItemsMap[id] = newItem;
     }
 
     void MainWindow::UpdateExplorerItem(int32_t id, hstring const& newName)
@@ -208,43 +201,12 @@ namespace winrt::PowerRenameUILib::implementation
 
     PowerRenameUILib::ExplorerItem MainWindow::FindById(int32_t id)
     {
-        auto fakeRoot = winrt::make<PowerRenameUILib::implementation::ExplorerItem>(0, L"Fake", L"", 0, false);
-        fakeRoot.Children(m_explorerItems);
-        return FindById(fakeRoot, id);
+        return m_explorerItemsMap.contains(id) ? m_explorerItemsMap[id] : NULL;
     }
 
-    PowerRenameUILib::ExplorerItem MainWindow::FindById(PowerRenameUILib::ExplorerItem& root, int32_t id)
+    void MainWindow::ToggleAll(bool checked)
     {
-        if (root.Id() == id)
-            return root;
-
-        if (root.Type() == static_cast<UINT>(ExplorerItem::ExplorerItemType::Folder))
-        {
-            for (auto c : root.Children())
-            {
-                auto result = FindById(c, id);
-                if (result != NULL)
-                    return result;
-            }
-        }
-
-        return NULL;
-    }
-
-    void MainWindow::ToggleAll(PowerRenameUILib::ExplorerItem node, bool checked)
-    {
-        if (node == NULL)
-            return;
-
-        node.Checked(checked);
-
-        if (node.Type() == static_cast<UINT>(ExplorerItem::ExplorerItemType::Folder))
-        {
-            for (auto c : node.Children())
-            {
-                ToggleAll(c, checked);
-            }
-        }
+        std::for_each(m_explorerItems.begin(), m_explorerItems.end(), [checked](auto item) { item.Checked(checked); });
     }
 
     void MainWindow::Checked_ids(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::RoutedEventArgs const&)
@@ -252,7 +214,7 @@ namespace winrt::PowerRenameUILib::implementation
         auto checkbox = sender.as<Windows::UI::Xaml::Controls::CheckBox>();
         auto id = std::stoi(std::wstring{ checkbox.Name() });
         auto item = FindById(id);
-        if (checkbox.IsChecked().GetBoolean() != item.Checked())
+        if (item != NULL && checkbox.IsChecked().GetBoolean() != item.Checked())
         {
             m_uiUpdatesItem.Checked(checkbox.IsChecked().GetBoolean());
             m_uiUpdatesItem.ChangedExplorerItemId(id);
@@ -263,9 +225,7 @@ namespace winrt::PowerRenameUILib::implementation
     {
         if (checkBox_selectAll().IsChecked().GetBoolean() != m_allSelected)
         {
-            auto fakeRoot = winrt::make<PowerRenameUILib::implementation::ExplorerItem>(0, L"Fake", L"", 0, false);
-            fakeRoot.Children(m_explorerItems);
-            ToggleAll(fakeRoot, checkBox_selectAll().IsChecked().GetBoolean());
+            ToggleAll(checkBox_selectAll().IsChecked().GetBoolean());
             m_uiUpdatesItem.ToggleAll();
             m_allSelected = !m_allSelected;
         }
@@ -278,6 +238,7 @@ namespace winrt::PowerRenameUILib::implementation
         if (!m_uiUpdatesItem.ShowAll())
         {
             m_explorerItems.Clear();
+            m_explorerItemsMap.clear();
             m_uiUpdatesItem.ShowAll(true);
         }
     }
@@ -289,6 +250,7 @@ namespace winrt::PowerRenameUILib::implementation
         if (m_uiUpdatesItem.ShowAll())
         {
             m_explorerItems.Clear();
+            m_explorerItemsMap.clear();
             m_uiUpdatesItem.ShowAll(false);
         }
     }
diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.h b/src/modules/powerrename/PowerRenameUILib/MainWindow.h
index b017ca3ac6..15e3bd05f2 100644
--- a/src/modules/powerrename/PowerRenameUILib/MainWindow.h
+++ b/src/modules/powerrename/PowerRenameUILib/MainWindow.h
@@ -7,7 +7,7 @@
 #include "MainWindow.g.h"
 #include "PatternSnippet.h"
 #include "ExplorerItem.h"
-#include "ExplorerItemTemplateSelector.h"
+#include <map>
 
 namespace winrt::PowerRenameUILib::implementation
 {
@@ -47,7 +47,7 @@ namespace winrt::PowerRenameUILib::implementation
 
         PowerRenameUILib::UIUpdates UIUpdatesItem();
 
-        void AddExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, int32_t parentId, bool checked);
+        void AddExplorerItem(int32_t id, hstring const& original, hstring const& renamed, int32_t type, uint32_t depth, bool checked);
         void UpdateExplorerItem(int32_t id, hstring const& newName);
         void UpdateRenamedExplorerItem(int32_t id, hstring const& newOriginalName);
         void AppendSearchMRU(hstring const& value);
@@ -61,13 +61,13 @@ namespace winrt::PowerRenameUILib::implementation
     private:
         bool m_allSelected;
         PowerRenameUILib::UIUpdates m_uiUpdatesItem;
-        PowerRenameUILib::ExplorerItem FindById(int32_t id);
-        PowerRenameUILib::ExplorerItem FindById(PowerRenameUILib::ExplorerItem& root, int32_t id);
-        void ToggleAll(PowerRenameUILib::ExplorerItem node, bool checked);
+        inline PowerRenameUILib::ExplorerItem FindById(int32_t id);
+        void ToggleAll(bool checked);
 
         winrt::Windows::Foundation::Collections::IObservableVector<hstring> m_searchMRU;
         winrt::Windows::Foundation::Collections::IObservableVector<hstring> m_replaceMRU;
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUILib::ExplorerItem> m_explorerItems;
+        std::map<int32_t, PowerRenameUILib::ExplorerItem> m_explorerItemsMap;
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUILib::PatternSnippet> m_searchRegExShortcuts;
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUILib::PatternSnippet> m_dateTimeShortcuts;
 
diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.idl b/src/modules/powerrename/PowerRenameUILib/MainWindow.idl
index 344ccf8ebc..00c65a531e 100644
--- a/src/modules/powerrename/PowerRenameUILib/MainWindow.idl
+++ b/src/modules/powerrename/PowerRenameUILib/MainWindow.idl
@@ -14,6 +14,8 @@ namespace PowerRenameUILib
         void CloseUIWindow(Boolean closeUIWindow);
         Boolean ButtonRenameEnabled;
         void Rename();
+        String OriginalCount;
+        String RenamedCount;
     }
 
     [default_interface] runtimeclass MainWindow : Windows.UI.Xaml.Controls.UserControl
@@ -50,7 +52,7 @@ namespace PowerRenameUILib
         Windows.UI.Xaml.Controls.Primitives.ToggleButton ToggleButtonTitleCase { get; };
         Windows.UI.Xaml.Controls.Primitives.ToggleButton ToggleButtonCapitalize { get; };
 
-        void AddExplorerItem(Int32 id, String original, String renamed, Int32 type, Int32 parentId, Boolean checked);
+        void AddExplorerItem(Int32 id, String original, String renamed, Int32 type, UInt32 depth, Boolean checked);
         void UpdateExplorerItem(Int32 id, String newName);
         void UpdateRenamedExplorerItem(Int32 id, String newOriginalName);
         void AppendSearchMRU(String value);
diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml b/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
index 88336778b8..ae272846a8 100644
--- a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
@@ -1,78 +1,6 @@
 <UserControl x:Class="PowerRenameUILib.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:PowerRenameUILib" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" controls:BackdropMaterial.ApplyToRootOrPageBackground="True" xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" mc:Ignorable="d">
 
-    <UserControl.Resources>
-
-        <local:ExplorerItemTemplateSelector x:Key="ExplorerItemTemplateSelector" FolderTemplate="{StaticResource FolderTemplate}" FileTemplate="{StaticResource FileTemplate}" />
-        <local:ExplorerItemTemplateSelector x:Key="RenamedExplorerItemTemplateSelector" FolderTemplate="{StaticResource RenamedFolderTemplate}" FileTemplate="{StaticResource RenamedFileTemplate}" />
-
-        <DataTemplate x:Key="FileTemplate" x:DataType="local:ExplorerItem">
-            <Grid Height="24" Margin="0,4,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="36" />
-                    <ColumnDefinition Width="36" />
-                    <ColumnDefinition Width="300" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <CheckBox TabIndex="0" Grid.Column="0" XYFocusKeyboardNavigation="Enabled" Checked="Checked_ids" IsTabStop="True" Unchecked="Checked_ids" Content="" Name="{x:Bind IdStr}" AutomationProperties.Name="{x:Bind Original}" AutomationProperties.HelpText="{x:Bind Renamed}" IsChecked="{x:Bind Checked, Mode=TwoWay}" />
-                <Image Width="16" Source="ms-appx:///Assets/file.png" HorizontalAlignment="Left" Grid.Column="1" />
-
-                <TextBlock Text="{x:Bind Original, Mode=OneWay}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" FontSize="12" Grid.Column="2" />
-            </Grid>
-        </DataTemplate>
-
-        <DataTemplate x:Key="FolderTemplate" x:DataType="local:ExplorerItem">
-            <Grid Margin="0,4,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="36" />
-                    <ColumnDefinition Width="36" />
-                    <ColumnDefinition Width="300" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="24" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-
-                <CheckBox TabIndex="0" IsTabStop="True" XYFocusKeyboardNavigation="Enabled" Grid.Row="0" Grid.Column="0" Checked="Checked_ids" Unchecked="Checked_ids" Content="" Name="{x:Bind IdStr}" AutomationProperties.Name="{x:Bind Original}" AutomationProperties.HelpText="{x:Bind Renamed}" IsChecked="{x:Bind Checked, Mode=TwoWay}" />
-                <Image Width="16" Source="ms-appx:///Assets/folder.png" HorizontalAlignment="Left" Grid.Column="1" />
-
-                <TextBlock Text="{x:Bind Original, Mode=OneWay}" Foreground="{ThemeResource TextFillColorSecondaryBrush}" VerticalAlignment="Center" FontSize="12" Grid.Column="2" />
-
-                <ListView Grid.ColumnSpan="3" IsTabStop="false" XYFocusKeyboardNavigation="Enabled" SelectionMode="None" IsItemClickEnabled="False" ItemsSource="{x:Bind Children}" Grid.Row="1" ItemTemplateSelector="{StaticResource ExplorerItemTemplateSelector}">
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="ListViewItem">
-                            <Setter Property="IsTabStop" Value="False" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
-                </ListView>
-            </Grid>
-        </DataTemplate>
-
-        <DataTemplate x:Key="RenamedFileTemplate" x:DataType="local:ExplorerItem">
-            <Grid Height="24" Margin="0,4,0,0">
-                <TextBlock Text="{x:Bind Renamed, Mode=OneWay}" FontWeight="SemiBold" VerticalAlignment="Center" FontSize="14" />
-            </Grid>
-        </DataTemplate>
-        <DataTemplate x:Key="RenamedFolderTemplate" x:DataType="local:ExplorerItem">
-            <Grid Margin="0,4,0,0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="24" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <TextBlock Text="{x:Bind Renamed, Mode=OneWay}" FontWeight="Bold" VerticalAlignment="Center" FontSize="14" />
-                <ListView IsTabStop="false" Margin="-12,0,0,0" SelectionMode="None" IsItemClickEnabled="False" ItemsSource="{x:Bind Children}" Grid.Row="1" ItemTemplateSelector="{StaticResource RenamedExplorerItemTemplateSelector}">
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="ListViewItem">
-                            <Setter Property="IsTabStop" Value="False" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
-                </ListView>
-            </Grid>
-        </DataTemplate>
-    </UserControl.Resources>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="20">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="12">
         <Grid.RowDefinitions>
             <RowDefinition Height="0" /> <!-- 48 if we need to draw the title bar ourself -->
             <RowDefinition Height="*" />
@@ -82,27 +10,45 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Row="1" Grid.Column="1" Background="{ThemeResource LayerFillColorDefaultBrush}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" CornerRadius="8" BorderThickness="1" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
+        <Grid Grid.Row="1"
+              Grid.Column="1"
+              Background="{ThemeResource LayerFillColorDefaultBrush}"
+              VerticalAlignment="Stretch"
+              HorizontalAlignment="Stretch"
+              CornerRadius="8"
+              BorderThickness="1"
+              BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
             <Grid.RowDefinitions>
-                <RowDefinition Height="48" />
+                <RowDefinition Height="40" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="36" />
-                <ColumnDefinition Width="48" />
-                <ColumnDefinition Width="Auto" MinWidth="324" />
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="48" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <CheckBox x:Name="checkBox_selectAll" IsChecked="True" Content="" x:Uid="SelectAllCheckBox" Margin="16,0,0,0" Checked="SelectAll" Unchecked="SelectAll" />
-            <Image Width="16" Grid.Column="1" Source="ms-appx:///Assets/file.png" HorizontalAlignment="Center" />
+            <StackPanel Orientation="Horizontal">
+                <CheckBox x:Name="checkBox_selectAll" IsChecked="True" MinWidth="0" Content="" x:Uid="SelectAllCheckBox" Margin="10,0,0,0" Checked="SelectAll" Unchecked="SelectAll" />
+                <Image Width="16" Margin="4,0,0,0" Source="ms-appx:///Assets/file.png" HorizontalAlignment="Left" />
 
-            <TextBlock x:Uid="TxtBlock_Original" Grid.Column="2" FontWeight="Medium" Margin="2,-2,0,0" VerticalAlignment="Center" />
-            <AppBarSeparator Grid.Column="3" Margin="-6,4,0,4" HorizontalAlignment="Left" />
-            <TextBlock x:Uid="TxtBlock_Renamed" FontWeight="Medium" Grid.Column="3" Margin="4,-2,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
-            <Button Content="&#xE16E;" Background="Transparent" FontFamily="{ThemeResource SymbolThemeFontFamily}" Height="32" x:Uid="FilterButton" Grid.Column="4" BorderThickness="0" HorizontalAlignment="Right" Margin="0,0,8,0">
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Column="2" Margin="6,-2,0,0" >
+                    <TextBlock x:Uid="TxtBlock_Original" FontWeight="Medium" />
+                    <TextBlock FontWeight="Medium" Margin="4,0,0,0" >
+                        <Run Text="(" /><Run Text="{x:Bind UIUpdatesItem.OriginalCount, Mode=OneWay}" /><Run Text=")" />
+                    </TextBlock>
+                </StackPanel>
+            </StackPanel>
+            <AppBarSeparator Margin="-6,4,0,4" HorizontalAlignment="Right" />
+            
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Column="2" Margin="4,-2,0,0" >
+                <TextBlock x:Uid="TxtBlock_Renamed" FontWeight="Medium" />
+                <TextBlock FontWeight="Medium" Margin="4,0,0,0" >
+                        <Run Text="(" /><Run Text="{x:Bind UIUpdatesItem.RenamedCount, Mode=OneWay}" /><Run Text=")" />
+                </TextBlock>
+            </StackPanel>
+            
+            <Button Content="&#xE16E;" Background="Transparent" FontFamily="{ThemeResource SymbolThemeFontFamily}" Height="32" x:Uid="FilterButton" Grid.Column="1" BorderThickness="0" HorizontalAlignment="Right" Margin="0,0,8,0">
                 <Button.Flyout>
                     <MenuBarItemFlyout Placement="Bottom">
                         <controls:RadioMenuFlyoutItem x:Name="button_showAll" Click="ShowAll" x:Uid="ShowAll" IsChecked="True" GroupName="Filter" />
@@ -112,45 +58,78 @@
             </Button>
 
             <Rectangle Height="1" Grid.ColumnSpan="5" Fill="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" />
-            <ScrollViewer Grid.ColumnSpan="6" HorizontalScrollMode="Enabled" Grid.Row="1">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" MinWidth="286" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <ListView IsTabStop="false" SelectionMode="None" XYFocusKeyboardNavigation="Enabled" IsItemClickEnabled="False" ItemsSource="{x:Bind ExplorerItems, Mode=OneWay}" Margin="4,0,0,0" ItemTemplateSelector="{StaticResource ExplorerItemTemplateSelector}">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="IsTabStop" Value="False" />
-                            </Style>
-                        </ListView.ItemContainerStyle>
-                    </ListView>
-                    <!--<controls:ItemsRepeater ItemsSource="{x:Bind ExplorerItems, Mode=OneWay}"
-                                            Margin="16,0,0,0"
-                                            ItemTemplate="{StaticResource ExplorerItemTemplateSelector}" />-->
-                    <ListView Grid.Column="1" IsTabStop="false" SelectionMode="None" IsItemClickEnabled="False" ItemsSource="{x:Bind ExplorerItems, Mode=OneWay}" ItemTemplateSelector="{StaticResource RenamedExplorerItemTemplateSelector}">
-                        <ListView.ItemContainerStyle>
-                            <Style TargetType="ListViewItem">
-                                <Setter Property="IsTabStop" Value="False" />
-                            </Style>
-                        </ListView.ItemContainerStyle>
-                    </ListView>
-                    <!--<controls:ItemsRepeater ItemsSource="{x:Bind ExplorerItems, Mode=OneWay}"
-                                            Grid.Column="1"
-                                            ItemTemplate="{StaticResource RenamedExplorerItemTemplateSelector}" />-->
-                </Grid>
-            </ScrollViewer>
+            <ListView IsTabStop="false"
+                        SelectionMode="None"
+                        XYFocusKeyboardNavigation="Enabled"
+                        IsItemClickEnabled="False"
+                        Grid.ColumnSpan="6" 
+                        ItemsSource="{x:Bind ExplorerItems, Mode=OneWay}"
+                        Margin="0,0,0,0"
+                        Grid.Row="1">
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem">
+                        <Setter Property="IsTabStop" Value="False" />
+                        <Setter Property="Padding" Value="0"/>
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="MinHeight" Value="0"/>
+                        <Setter Property="HorizontalContentAlignment"  Value="Stretch"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ListViewItem">
+                                    <StackPanel Orientation="Vertical">
+                                        <ContentPresenter />
+                                        <Rectangle Height="1" Margin="0,4,0,0" Opacity="0.8" Grid.ColumnSpan="5" Fill="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" />
+
+                                    </StackPanel>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ListView.ItemContainerStyle>
+                <ListView.ItemTemplate>
+                    <DataTemplate x:Name="ExplorerItemTemplate" x:DataType="local:ExplorerItem">
+                        <Grid Height="20" Margin="10,4,0,0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <StackPanel Orientation="Horizontal" Grid.Column="0">
+                                <StackPanel MinWidth="{x:Bind Indentation}"/>
+                                <CheckBox TabIndex="0"
+                             MinWidth="0"
+                              XYFocusKeyboardNavigation="Enabled"
+                              Checked="Checked_ids"
+                              IsTabStop="True"
+                              Unchecked="Checked_ids"
+                              Content=""
+                              Name="{x:Bind IdStr}"
+                              AutomationProperties.Name="{x:Bind Original}"
+                              AutomationProperties.HelpText="{x:Bind Renamed}"
+                              IsChecked="{x:Bind Checked, Mode=TwoWay}" />
+                                <Image Width="16" Margin="4,0,0,0" Source="{x:Bind ImagePath}" HorizontalAlignment="Left" />
+                                <TextBlock Margin="6,0,0,0"
+                               Text="{x:Bind Original, Mode=OneWay}"
+                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                               VerticalAlignment="Center"
+                               FontSize="12" />
+                            </StackPanel>
+                            <TextBlock Text="{x:Bind Renamed, Mode=OneWay}" Grid.Column="1" FontWeight="Bold" VerticalAlignment="Center" FontSize="12" />
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
         </Grid>
 
-        <Grid Grid.Column="0" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
+        <Grid Grid.Column="0" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="48" />
             </Grid.RowDefinitions>
             <ScrollViewer>
-                <StackPanel Orientation="Vertical" Padding="0,0,0,16" Margin="0,0,20,0">
+                <StackPanel Orientation="Vertical" Padding="0,0,0,16" Margin="0,0,12,0">
                     <Grid>
-                        <AutoSuggestBox x:Name="textBox_search" x:Uid="SearchBox" Height="48" VerticalContentAlignment="Center" ItemsSource="{x:Bind SearchMRU}" />
+                        <AutoSuggestBox x:Name="textBox_search" x:Uid="SearchBox" Height="40" VerticalContentAlignment="Center" ItemsSource="{x:Bind SearchMRU}" />
 
                         <Button FontFamily="{ThemeResource SymbolThemeFontFamily}" VerticalAlignment="Center" Visibility="{Binding ElementName=checkBox_regex, Path=IsChecked}" MinHeight="32" Margin="4" x:Uid="RegExButton" Background="Transparent" BorderBrush="Transparent" Content="&#xE946;" HorizontalAlignment="Right">
                             <Button.Flyout>
@@ -189,13 +168,13 @@
                     </Grid>
 
 
-                    <CheckBox x:Name="checkBox_regex" x:Uid="CheckBox_RegEx" Margin="2,12,0,0" />
-                    <CheckBox x:Name="checkBox_matchAll" x:Uid="CheckBox_MatchAll" Margin="2,4,0,0" />
-                    <CheckBox x:Name="checkBox_case" x:Uid="CheckBox_Case" Margin="2,4,0,0" />
+                    <CheckBox x:Name="checkBox_regex" x:Uid="CheckBox_RegEx" Margin="2,6,0,0" />
+                    <CheckBox x:Name="checkBox_matchAll" x:Uid="CheckBox_MatchAll" Margin="2,0,0,0" />
+                    <CheckBox x:Name="checkBox_case" x:Uid="CheckBox_Case" Margin="2,0,0,0" />
 
                     <Rectangle Height="1" Fill="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalAlignment="Stretch" Margin="0,16,0,20" />
                     <Grid>
-                        <AutoSuggestBox x:Name="textBox_replace" Margin="0,0,0,0" x:Uid="ReplaceBox" Height="48" VerticalContentAlignment="Center" Padding="12,12,0,0" ItemsSource="{x:Bind ReplaceMRU}" />
+                        <AutoSuggestBox x:Name="textBox_replace" Margin="0,0,0,0" x:Uid="ReplaceBox" Height="40" VerticalContentAlignment="Center" Padding="12,12,0,0" ItemsSource="{x:Bind ReplaceMRU}" />
 
                         <Button FontFamily="{ThemeResource SymbolThemeFontFamily}" VerticalAlignment="Center" MinHeight="32" Margin="4" x:Uid="FileCreationButton" Background="Transparent" BorderBrush="Transparent" Content="&#xE946;" HorizontalAlignment="Right">
                             <Button.Flyout>
@@ -230,7 +209,7 @@
                         </Button>
                     </Grid>
 
-                    <TextBlock x:Uid="TextBox_ApplyTo" x:Name="ApplyToLabel" FontSize="12" Margin="0,20,0,8" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <TextBlock x:Uid="TextBox_ApplyTo" x:Name="ApplyToLabel" FontSize="12" Margin="0,12,0,8" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
 
                     <StackPanel Orientation="Horizontal" Grid.Column="1" Spacing="4" Grid.Row="1">
                         <ComboBox x:Name="comboBox_renameParts" SelectedIndex="0" Width="200" AutomationProperties.LabeledBy="{Binding ElementName=ApplyToLabel}" HorizontalAlignment="Stretch" Grid.Column="0" Grid.Row="1">
@@ -239,20 +218,20 @@
                             <x:String>Extension only</x:String>
                         </ComboBox>
                         <AppBarSeparator Margin="5,0,5,0" />
-                        <ToggleButton x:Name="toggleButton_includeFiles" Content="&#xE160;" MinHeight="32" IsChecked="True" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="ToggleButton_IncludeFiles" Style="{StaticResource CustomToggleButtonStyle}" />
-                        <ToggleButton x:Name="toggleButton_includeFolders" Content="&#xE8B7;" MinHeight="32" IsChecked="True" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="ToggleButton_IncludeFolders" Style="{StaticResource CustomToggleButtonStyle}" />
-                        <ToggleButton x:Name="toggleButton_includeSubfolders" Content="&#xE12F;" MinHeight="32" IsChecked="True" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="ToggleButton_IncludeSubFolders" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_includeFiles" Content="&#xE160;" MinHeight="0" Height="31" IsChecked="True" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="ToggleButton_IncludeFiles" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_includeFolders" Content="&#xE8B7;" MinHeight="0" Height="31" IsChecked="True" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="ToggleButton_IncludeFolders" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_includeSubfolders" Content="&#xE12F;" MinHeight="0" Height="31" IsChecked="True" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="ToggleButton_IncludeSubFolders" Style="{StaticResource CustomToggleButtonStyle}" />
                     </StackPanel>
 
 
-                    <TextBlock x:Uid="TextBlock_TextFormatting" FontSize="12" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Margin="0,20,0,8" />
+                    <TextBlock x:Uid="TextBlock_TextFormatting" FontSize="12" Foreground="{ThemeResource TextFillColorSecondaryBrush}" Margin="0,12,0,8" />
 
 
                     <StackPanel Orientation="Horizontal" Spacing="4">
-                        <ToggleButton x:Name="toggleButton_lowerCase" Content="aa" FontWeight="Medium" MinHeight="32" x:Uid="ToggleButton_Lowercase" Style="{StaticResource CustomToggleButtonStyle}" />
-                        <ToggleButton x:Name="toggleButton_upperCase" Content="AA" FontWeight="Medium" MinHeight="32" x:Uid="ToggleButton_Uppercase" Style="{StaticResource CustomToggleButtonStyle}" />
-                        <ToggleButton x:Name="toggleButton_titleCase" Content="Aa" FontWeight="Medium" MinHeight="32" x:Uid="ToggleButton_TitleCase" Style="{StaticResource CustomToggleButtonStyle}" />
-                        <ToggleButton x:Name="toggleButton_capitalize" Content="Aa Aa" FontWeight="Medium" MinHeight="32" x:Uid="ToggleButton_Capitalize" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_lowerCase" Content="aa" FontWeight="Medium" MinHeight="0" Height="31" x:Uid="ToggleButton_Lowercase" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_upperCase" Content="AA" FontWeight="Medium" MinHeight="0" Height="31" x:Uid="ToggleButton_Uppercase" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_titleCase" Content="Aa" FontWeight="Medium" MinHeight="0" Height="31" x:Uid="ToggleButton_TitleCase" Style="{StaticResource CustomToggleButtonStyle}" />
+                        <ToggleButton x:Name="toggleButton_capitalize" Content="Aa Aa" FontWeight="Medium" MinHeight="0" Height="31" x:Uid="ToggleButton_Capitalize" Style="{StaticResource CustomToggleButtonStyle}" />
                         <AppBarSeparator Margin="5,0,5,0" />
 
                         <ToggleButton x:Name="toggleButton_enumItems" Content="&#xEA40;" FontFamily="{ThemeResource SymbolThemeFontFamily}" MinHeight="32" x:Uid="ToggleButton_EnumItems" Style="{StaticResource CustomToggleButtonStyle}" />
@@ -260,29 +239,38 @@
                 </StackPanel>
             </ScrollViewer>
 
-            <Rectangle Height="1" Fill="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalAlignment="Stretch" Margin="0,0,20,0" VerticalAlignment="Top" Grid.Row="1" />
+            <Rectangle Height="1" Fill="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalAlignment="Stretch" Margin="0,0,12,0" VerticalAlignment="Top" Grid.Row="1" />
 
 
-            <StackPanel Orientation="Horizontal" Grid.Row="1" Spacing="8" Margin="0" Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Left">
+      
+        </Grid>
 
-                <Button x:Name="button_settings" Height="32" x:Uid="TxtBlock_ButtonSettings" FontFamily="{ThemeResource SymbolThemeFontFamily}" Grid.Row="5" Padding="6" Background="Transparent" BorderBrush="Transparent" Grid.Column="1">
-                    <Button.Content>
-                        <controls:AnimatedIcon x:Name="SearchAnimatedIcon">
-                            <controls:AnimatedIcon.Source>
-                                <animatedVisuals:AnimatedSettingsVisualSource />
-                            </controls:AnimatedIcon.Source>
-                            <controls:AnimatedIcon.FallbackIconSource>
-                                <controls:SymbolIconSource Symbol="Setting" />
-                            </controls:AnimatedIcon.FallbackIconSource>
-                        </controls:AnimatedIcon>
+        <StackPanel Orientation="Horizontal"
+                    Grid.Row="2"
+                    Spacing="8"
+                    Margin="0"
+                    Grid.Column="0"
+                    VerticalAlignment="Bottom"
+                    HorizontalAlignment="Left">
 
-                    </Button.Content>
-                </Button>
+            <Button x:Name="button_settings" Height="32" x:Uid="TxtBlock_ButtonSettings" FontFamily="{ThemeResource SymbolThemeFontFamily}" Grid.Row="5" Padding="6" Background="Transparent" BorderBrush="Transparent" Grid.Column="1">
+                <Button.Content>
+                    <controls:AnimatedIcon x:Name="SearchAnimatedIcon">
+                        <controls:AnimatedIcon.Source>
+                            <animatedVisuals:AnimatedSettingsVisualSource />
+                        </controls:AnimatedIcon.Source>
+                        <controls:AnimatedIcon.FallbackIconSource>
+                            <controls:SymbolIconSource Symbol="Setting" />
+                        </controls:AnimatedIcon.FallbackIconSource>
+                    </controls:AnimatedIcon>
 
-                <Button x:Name="button_docs" Content="&#xE11B;" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="DocsButton" Background="Transparent" BorderBrush="Transparent" Grid.Row="1" Height="32" VerticalAlignment="Bottom" HorizontalAlignment="Left" Click="OpenDocs" />
+                </Button.Content>
+            </Button>
+
+            <Button x:Name="button_docs" Content="&#xE11B;" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="DocsButton" Background="Transparent" BorderBrush="Transparent" Grid.Row="1" Height="32" VerticalAlignment="Bottom" HorizontalAlignment="Left" Click="OpenDocs" />
 
 
-                <!--<Button Content="&#xE728;"
+            <!--<Button Content="&#xE728;"
                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                         ToolTipService.ToolTip="Presets"
                         Background="Transparent"
@@ -300,26 +288,27 @@
                     </Button.Flyout>
                 </Button>-->
 
-            </StackPanel>
+        </StackPanel>
 
-            <muxc:SplitButton Grid.Row="1" Style="{StaticResource SplitAccentButtonStyle}" x:Name="button_rename" Margin="0,0,20,0" x:Uid="ButtonApply" Click="button_rename_Click" HorizontalAlignment="Right" VerticalAlignment="Bottom" IsEnabled="{x:Bind UIUpdatesItem.ButtonRenameEnabled, Mode=OneWay}">
-                <muxc:SplitButton.KeyboardAccelerators>
-                    <KeyboardAccelerator Key="Enter" />
-                    <KeyboardAccelerator Key="Enter" Modifiers="Control" />
-                </muxc:SplitButton.KeyboardAccelerators>
-                <muxc:SplitButton.Content>
-                    <StackPanel Orientation="Horizontal">
-                        <FontIcon Glyph="&#xE13E;" FontSize="14" VerticalAlignment="Center" Margin="0,2,10,0" />
-                        <TextBlock x:Uid="TxtBlock_ButtonApply" />
-                    </StackPanel>
-                </muxc:SplitButton.Content>
-                <muxc:SplitButton.Flyout>
-                    <MenuFlyout>
-                        <MenuFlyoutItem x:Uid="TxtBlock_ButtonApplyAndClose" Click="MenuFlyoutItem_Click" />
-                    </MenuFlyout>
-                </muxc:SplitButton.Flyout>
-            </muxc:SplitButton>
-        </Grid>
+    
+       
+        <muxc:SplitButton Grid.Row="2" Style="{StaticResource SplitAccentButtonStyle}" Grid.Column="0" Margin="0,0,12,1" x:Name="button_rename" x:Uid="ButtonApply" Click="button_rename_Click" HorizontalAlignment="Right" VerticalAlignment="Bottom" IsEnabled="{x:Bind UIUpdatesItem.ButtonRenameEnabled, Mode=OneWay}">
+            <muxc:SplitButton.KeyboardAccelerators>
+                <KeyboardAccelerator Key="Enter" />
+                <KeyboardAccelerator Key="Enter" Modifiers="Control" />
+            </muxc:SplitButton.KeyboardAccelerators>
+            <muxc:SplitButton.Content>
+                <StackPanel Orientation="Horizontal">
+                    <FontIcon Glyph="&#xE13E;" FontSize="14" VerticalAlignment="Center" Margin="0,2,10,0" />
+                    <TextBlock x:Uid="TxtBlock_ButtonApply" />
+                </StackPanel>
+            </muxc:SplitButton.Content>
+            <muxc:SplitButton.Flyout>
+                <MenuFlyout>
+                    <MenuFlyoutItem x:Uid="TxtBlock_ButtonApplyAndClose" Click="MenuFlyoutItem_Click" />
+                </MenuFlyout>
+            </muxc:SplitButton.Flyout>
+        </muxc:SplitButton>
 
         <!--<StackPanel x:Name="TitleBar" Orientation="Horizontal">
             <Image Source="Assets/PowerRename.png" Width="16" Height="16" VerticalAlignment="Top" Margin="20,9,0,0"/>
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj
index 5886229b5f..3042adf48b 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUILib.vcxproj
@@ -54,7 +54,8 @@
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings"></ImportGroup>
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -108,7 +109,6 @@
   <ItemGroup>
     <ClInclude Include="app.base.h" />
     <ClInclude Include="ExplorerItem.h" />
-    <ClInclude Include="ExplorerItemTemplateSelector.h" />
     <ClInclude Include="MainWindow.h">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -146,7 +146,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ExplorerItem.cpp" />
-    <ClCompile Include="ExplorerItemTemplateSelector.cpp" />
     <ClCompile Include="MainWindow.cpp">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -166,7 +165,6 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Midl>
     <Midl Include="ExplorerItem.idl" />
-    <Midl Include="ExplorerItemTemplateSelector.idl" />
     <Midl Include="MainWindow.idl">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/src/modules/powerrename/PowerRenameUILib/UIUpdates.cpp b/src/modules/powerrename/PowerRenameUILib/UIUpdates.cpp
index eef989ec0c..b0fb8eef91 100644
--- a/src/modules/powerrename/PowerRenameUILib/UIUpdates.cpp
+++ b/src/modules/powerrename/PowerRenameUILib/UIUpdates.cpp
@@ -64,6 +64,34 @@ namespace winrt::PowerRenameUILib::implementation
         m_propertyChanged(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"Rename" });
     }
 
+    hstring UIUpdates::OriginalCount()
+    {
+        return m_originalCount;
+    }
+
+    void UIUpdates::OriginalCount(hstring value)
+    {
+        if (m_originalCount != value)
+        {
+            m_originalCount = value;
+            m_propertyChanged(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"OriginalCount" });
+        }
+    }
+
+    hstring UIUpdates::RenamedCount()
+    {
+        return m_renamedCount;
+    }
+
+    void UIUpdates::RenamedCount(hstring value)
+    {
+        if (m_renamedCount != value)
+        {
+            m_renamedCount = value;
+            m_propertyChanged(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"RenamedCount" });
+        }
+    }
+
     bool UIUpdates::CloseUIWindow()
     {
         return m_closeUIWindow;
diff --git a/src/modules/powerrename/PowerRenameUILib/UIUpdates.h b/src/modules/powerrename/PowerRenameUILib/UIUpdates.h
index b9ca2f38c3..7a221d37c1 100644
--- a/src/modules/powerrename/PowerRenameUILib/UIUpdates.h
+++ b/src/modules/powerrename/PowerRenameUILib/UIUpdates.h
@@ -21,6 +21,10 @@ namespace winrt::PowerRenameUILib::implementation
         bool ButtonRenameEnabled();
         void ButtonRenameEnabled(bool value);
         void Rename();
+        hstring OriginalCount();
+        void OriginalCount(hstring value);
+        hstring RenamedCount();
+        void RenamedCount(hstring value);
 
     private:
         bool m_showAll;
@@ -28,6 +32,8 @@ namespace winrt::PowerRenameUILib::implementation
         bool m_checked;
         bool m_closeUIWindow;
         bool m_buttonRenameEnabled;
+        hstring m_originalCount;
+        hstring m_renamedCount;
         winrt::event<Windows::UI::Xaml::Data::PropertyChangedEventHandler> m_propertyChanged;
     };
 }
diff --git a/src/modules/powerrename/PowerRenameUILib/pch.h b/src/modules/powerrename/PowerRenameUILib/pch.h
index 76b2cfbd5a..a8ce8a54e2 100644
--- a/src/modules/powerrename/PowerRenameUILib/pch.h
+++ b/src/modules/powerrename/PowerRenameUILib/pch.h
@@ -16,6 +16,7 @@
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
 #include <winrt/Windows.UI.Xaml.Data.h>
+#include <winrt/Windows.UI.Xaml.Documents.h>
 #include <winrt/Windows.UI.Xaml.Interop.h>
 #include <winrt/Windows.UI.Xaml.Markup.h>
 #include <winrt/Windows.UI.Xaml.Navigation.h>