diff --git a/Files UWP/App.xaml.cs b/Files UWP/App.xaml.cs
index c37c6f56e256..6a8a7be60f5e 100644
--- a/Files UWP/App.xaml.cs	
+++ b/Files UWP/App.xaml.cs	
@@ -23,12 +23,21 @@
 using System.Collections.ObjectModel;
 using Windows.Devices.Enumeration;
 using System.Text.RegularExpressions;
+using Windows.Devices.Portable;
+using Windows.UI.Xaml.Media.Imaging;
+using Windows.ApplicationModel.Core;
+using Windows.UI.Core;
+using Windows.Storage.Search;
+using Windows.UI.Xaml.Input;
 
 namespace Files
 {
     sealed partial class App : Application
     {
         public static ProHome selectedTabInstance { get; set; }
+        DeviceWatcher watcher;
+        public static ObservableCollection<SidebarItem> sideBarItems = new ObservableCollection<SidebarItem>();
+
         public App()
         {
             this.InitializeComponent();
@@ -55,12 +64,10 @@ public App()
                 if (localSettings.Values["theme"].ToString() == "Light")
                 {
                     SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Light;
-                    //Debug.WriteLine("Theme Requested as Light");
                 }
                 else if (localSettings.Values["theme"].ToString() == "Dark")
                 {
                     SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Dark;
-                    //Debug.WriteLine("Theme Requested as Dark");
                 }
                 else
                 {
@@ -69,19 +76,15 @@ public App()
                     if (color == Colors.White)
                     {
                         SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Light;
-                       // Debug.WriteLine("Theme Requested as Default (Light)");
-
                     }
                     else
                     {
                         SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Dark;
-                        //Debug.WriteLine("Theme Requested as Default (Dark)");
                     }
                 }
             }
 
             this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;
-            //Debug.WriteLine("!!Requested Theme!!" + RequestedTheme.ToString());
 
             if (localSettings.Values["FavoritesDisplayed_Start"] == null)
             {
@@ -113,91 +116,351 @@ public App()
                 localSettings.Values["DrivesDisplayed_NewTab"] = false;
             }
 
-            FindDrives();
-            //DeviceWatcher watcher = DeviceInformation.CreateWatcher();
-            //watcher.Added += (sender, info) => FindDrives();
-            //watcher.Removed += (sender, info) => FindDrives();
-            //watcher.Start();
+            PopulatePinnedSidebarItems();
         }
 
-        private async void FindDrives()
+        public void PopulateDrivesListWithLocalDisks()
         {
-            foundDrives.Clear();
-            var knownRemDevices = new ObservableCollection<string>();
-            foreach (var f in await KnownFolders.RemovableDevices.GetFoldersAsync())
-            {
-                var path = f.Path;
-                knownRemDevices.Add(path);
-            }
-
             var driveLetters = DriveInfo.GetDrives().Select(x => x.RootDirectory.Root).ToList().OrderBy(x => x.Root.FullName).ToList();
-
-            if (!driveLetters.Any()) return;
-
             driveLetters.ForEach(async roots =>
             {
                 try
                 {
-                    //if (roots.Name == @"C:\") return;
                     var content = string.Empty;
-                    string icon;
-                    if (knownRemDevices.Contains(roots.Name))
+                    string icon = null;
+                    if (!(await KnownFolders.RemovableDevices.GetFoldersAsync()).Select(x => x.Path).ToList().Contains(roots.Name))
                     {
-                        content = $"Removable Drive ({roots.Name})";
-                        icon = "\uE88E";
+                        // TODO: Display Custom Names for Local Disks as well
+                        content = $"Local Disk ({roots.Name.TrimEnd('\\')})";
+                        icon = "\uEDA2";
+
+                        await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                        async () =>
+                        {
+                            StorageFolder drive = await StorageFolder.GetFolderFromPathAsync(roots.Name);
+                            var retrivedProperties = await drive.Properties.RetrievePropertiesAsync(new string[] { "System.FreeSpace", "System.Capacity" });
+
+                            ulong totalSpaceProg = 0;
+                            ulong freeSpaceProg = 0;
+                            string free_space_text = "Unknown";
+                            string total_space_text = "Unknown";
+                            Visibility capacityBarVis = Visibility.Visible;
+                            try
+                            {
+                                var sizeAsGBString = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.FreeSpace"]).GigaBytes;
+                                freeSpaceProg = Convert.ToUInt64(sizeAsGBString);
+
+                                sizeAsGBString = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.Capacity"]).GigaBytes;
+                                totalSpaceProg = Convert.ToUInt64(sizeAsGBString);
+
+
+                                free_space_text = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.FreeSpace"]).ToString();
+                                total_space_text = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.Capacity"]).ToString();
+                            }
+                            catch (UnauthorizedAccessException)
+                            {
+                                capacityBarVis = Visibility.Collapsed;
+                            }
+                            catch (NullReferenceException)
+                            {
+                                capacityBarVis = Visibility.Collapsed;
+                            }
+
+                            App.foundDrives.Add(new DriveItem()
+                            {
+                                driveText = content,
+                                glyph = icon,
+                                maxSpace = totalSpaceProg,
+                                spaceUsed = totalSpaceProg - freeSpaceProg,
+                                tag = roots.Name,
+                                progressBarVisibility = capacityBarVis,
+                                spaceText = free_space_text + " free of " + total_space_text,
+                            });
+                        });
                     }
-                    else
+
+                }
+                catch (UnauthorizedAccessException e)
+                {
+                    Debug.WriteLine(e.Message);
+                }
+
+            });
+
+            
+
+        }
+
+        private async void Watcher_EnumerationCompleted(DeviceWatcher sender, object args)
+        {
+            PopulateDrivesListWithLocalDisks();
+            DeviceAdded(sender, null);
+            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+            () =>
+            {
+                App.foundDrives.Add(new DriveItem()
+                {
+                    driveText = "OneDrive",
+                    tag = "OneDrive",
+                    cloudGlyphVisibility = Visibility.Visible,
+                    driveGlyphVisibility = Visibility.Collapsed
+                });
+            });
+        }
+
+        private void DeviceUpdated(DeviceWatcher sender, DeviceInformationUpdate args)
+        {
+            Debug.WriteLine("Devices updated");
+        }
+
+
+        private async void DeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate args)
+        {
+            var devices = DriveInfo.GetDrives().Select(x => x.RootDirectory.Root).ToList().OrderBy(x => x.Root.FullName).ToList();
+
+            foreach (DriveItem driveItem in foundDrives)
+            {
+                if (!driveItem.tag.Equals("OneDrive"))
+                {
+                    if (!devices.Any(x => x.Name == driveItem.tag) || devices.Equals(null))
                     {
-                        content = $"Local Disk ({roots.Name})";
-                        icon = "\uEDA2";
+                        await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                        () =>
+                        {
+                            foundDrives.Remove(driveItem);
+                        });
+                        return;
+
                     }
-                    StorageFolder drive = await StorageFolder.GetFolderFromPathAsync(roots.Name);
-                    var retrivedProperties = await drive.Properties.RetrievePropertiesAsync(new string[] { "System.FreeSpace", "System.Capacity" });
-                    
-                    ulong totalSpaceProg = 0;
-                    ulong freeSpaceProg = 0;
-                    string free_space_text = "Unknown";
-                    string total_space_text = "Unknown";
-                    Visibility capacityBarVis = Visibility.Visible;
-                    try
+                }
+                
+            }
+        }
+
+        private async void DeviceAdded(DeviceWatcher sender, DeviceInformation args)
+        {
+            try
+            {
+                //var device = StorageDevice.FromId(args.Id);
+                var devices = (await KnownFolders.RemovableDevices.GetFoldersAsync()).OrderBy(x => x.Path);
+                foreach(StorageFolder device in devices)
+                {
+                    var letter = device.Path;
+                    if(!foundDrives.Any(x => x.tag == letter))
                     {
-                        var sizeAsGBString = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.FreeSpace"]).GigaBytes;
-                        freeSpaceProg = Convert.ToUInt64(sizeAsGBString);
+                        //if (roots.Name == @"C:\") return;
+                        var content = device.DisplayName;
+                        string icon = null;
+                        await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Low,
+                        async () =>
+                        {
+                            if (content.Contains("DVD"))
+                            {
+                                icon = "\uE958";
+                            }
+                            else
+                            {
+                                icon = "\uE88E";
+                            }
+
+                            StorageFolder drive = await StorageFolder.GetFolderFromPathAsync(letter);
+                            var retrivedProperties = await drive.Properties.RetrievePropertiesAsync(new string[] { "System.FreeSpace", "System.Capacity" });
+
+                            ulong totalSpaceProg = 0;
+                            ulong freeSpaceProg = 0;
+                            string free_space_text = "Unknown";
+                            string total_space_text = "Unknown";
+                            Visibility capacityBarVis = Visibility.Visible;
+                            try
+                            {
+                                var sizeAsGBString = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.FreeSpace"]).GigaBytes;
+                                freeSpaceProg = Convert.ToUInt64(sizeAsGBString);
+
+                                sizeAsGBString = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.Capacity"]).GigaBytes;
+                                totalSpaceProg = Convert.ToUInt64(sizeAsGBString);
+
+
+                                free_space_text = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.FreeSpace"]).ToString();
+                                total_space_text = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.Capacity"]).ToString();
+                            }
+                            catch (UnauthorizedAccessException)
+                            {
+                                capacityBarVis = Visibility.Collapsed;
+                            }
+                            catch (NullReferenceException)
+                            {
+                                capacityBarVis = Visibility.Collapsed;
+                            }
+
+                            if (!foundDrives.Any(x => x.tag == letter))
+                            {
+                                foundDrives.Add(new DriveItem()
+                                {
+                                    driveText = content,
+                                    glyph = icon,
+                                    maxSpace = totalSpaceProg,
+                                    spaceUsed = totalSpaceProg - freeSpaceProg,
+                                    tag = letter,
+                                    progressBarVisibility = capacityBarVis,
+                                    spaceText = free_space_text + " free of " + total_space_text,
+                                });
+                            }
+                        });
+                        
+                    }
+                }
+            }
+            catch (UnauthorizedAccessException e)
+            {
+               Debug.WriteLine(e.Message);
+            }
+        }
 
-                        sizeAsGBString = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.Capacity"]).GigaBytes;
-                        totalSpaceProg = Convert.ToUInt64(sizeAsGBString);
+        public static List<string> LinesToRemoveFromFile = new List<string>();
+
+        public async void PopulatePinnedSidebarItems()
+        {
 
+            AddDefaultLocations();
 
-                        free_space_text = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.FreeSpace"]).ToString();
-                        total_space_text = ByteSizeLib.ByteSize.FromBytes((ulong)retrivedProperties["System.Capacity"]).ToString();
+            StorageFile ListFile;
+            StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;
+            try
+            {
+                ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
+            }
+            catch (FileNotFoundException)
+            {
+                ListFile = await cacheFolder.CreateFileAsync("PinnedItems.txt");
+            }
+
+            if (ListFile != null)
+            {
+                var ListFileLines = await FileIO.ReadLinesAsync(ListFile);
+                foreach (string locationPath in ListFileLines)
+                {
+                    try
+                    {
+                        StorageFolder fol = await StorageFolder.GetFolderFromPathAsync(locationPath);
+                        var name = fol.DisplayName;
+                        var content = name;
+                        var icon = "\uE8B7";
+
+                        bool isDuplicate = false;
+                        foreach (SidebarItem sbi in sideBarItems)
+                        {
+                            if (!string.IsNullOrWhiteSpace(sbi.Path) && !sbi.isDefaultLocation)
+                            {
+                                if (sbi.Path.ToString() == locationPath)
+                                {
+                                    isDuplicate = true;
+
+                                }
+                            }
+                        }
+
+                        if (!isDuplicate)
+                        {
+                            sideBarItems.Add(new SidebarItem() { isDefaultLocation = false, Text = name, IconGlyph = icon, Path = locationPath });
+                        }
                     }
-                    catch (UnauthorizedAccessException)
+                    catch (UnauthorizedAccessException e)
                     {
-                        capacityBarVis = Visibility.Collapsed;
+                        Debug.WriteLine(e.Message);
                     }
-                    catch (NullReferenceException)
+                    catch (FileNotFoundException e)
                     {
-                        capacityBarVis = Visibility.Collapsed;
+                        Debug.WriteLine("Pinned item was deleted and will be removed from the file lines list soon: " + e.Message);
+                        LinesToRemoveFromFile.Add(locationPath);
                     }
+                    catch (System.Runtime.InteropServices.COMException e)
+                    {
+                        Debug.WriteLine("Pinned item's drive was ejected and will be removed from the file lines list soon: " + e.Message);
+                        LinesToRemoveFromFile.Add(locationPath);
+                    }
+                }
+
+                RemoveStaleSidebarItems();
+            }
+        }
+
+        private void AddDefaultLocations()
+        {
+            sideBarItems.Add(new SidebarItem() { Text = "Home", IconGlyph = "\uE737", isDefaultLocation = true });
+            sideBarItems.Add(new SidebarItem() { Text = "Desktop", IconGlyph = "\uE8FC", isDefaultLocation = true });
+            sideBarItems.Add(new SidebarItem() { Text = "Downloads", IconGlyph = "\uE896", isDefaultLocation = true });
+            sideBarItems.Add(new SidebarItem() { Text = "Documents", IconGlyph = "\uE8A5", isDefaultLocation = true });
+            sideBarItems.Add(new SidebarItem() { Text = "Pictures", IconGlyph = "\uEB9F", isDefaultLocation = true });
+            sideBarItems.Add(new SidebarItem() { Text = "Music", IconGlyph = "\uEC4F", isDefaultLocation = true });
+            sideBarItems.Add(new SidebarItem() { Text = "Videos", IconGlyph = "\uE8B2", isDefaultLocation = true });
+        }
+
+        public static async void RemoveStaleSidebarItems()
+        {
+            StorageFile ListFile;
+            StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;
+            try
+            {
+                ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
+            }
+            catch (FileNotFoundException)
+            {
+                ListFile = await cacheFolder.CreateFileAsync("PinnedItems.txt");
+            }
+
+            if (ListFile != null)
+            {
+                var ListFileLines = await FileIO.ReadLinesAsync(ListFile);
+                foreach (string path in LinesToRemoveFromFile)
+                {
+                    ListFileLines.Remove(path);
+                }
 
-                    foundDrives.Add(new DriveItem()
+                await FileIO.WriteLinesAsync(ListFile, ListFileLines);
+                ListFileLines = await FileIO.ReadLinesAsync(ListFile);
+
+                // Remove unpinned items from sidebar
+                var sideBarItems_Copy = sideBarItems.ToList();
+                foreach (SidebarItem location in sideBarItems)
+                {
+                    if(!location.isDefaultLocation)
                     {
-                        driveText = content,
-                        glyph = icon,
-                        maxSpace = totalSpaceProg,
-                        spaceUsed = totalSpaceProg - freeSpaceProg,
-                        tag = roots.Name,
-                        progressBarVisibility = capacityBarVis,
-                        spaceText = free_space_text + " free of " + total_space_text,
-                    });
+                        if (!ListFileLines.Contains(location.Path.ToString()))
+                        {
+                            sideBarItems_Copy.Remove(location);
+                        }
+                    }
+                    
                 }
-                catch (UnauthorizedAccessException e)
+                sideBarItems.Clear();
+                foreach(SidebarItem correctItem in sideBarItems_Copy)
                 {
-                    Debug.WriteLine(e.Message);
+                    sideBarItems.Add(correctItem);
                 }
-            });
+                LinesToRemoveFromFile.Clear();
+            }
+        }
+
+        public static SidebarItem rightClickedItem;
+
+        public static async void FlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;
+            var ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
+            var ListFileLines = await FileIO.ReadLinesAsync(ListFile);
+            foreach (string path in ListFileLines)
+            {
+                if (path == App.rightClickedItem.Path.ToString())
+                {
+                    App.LinesToRemoveFromFile.Add(path);
+                    RemoveStaleSidebarItems();
+                    return;
+                }
+            }
         }
 
+
+
         public static Windows.UI.Xaml.UnhandledExceptionEventArgs exceptionInfo { get; set; }
         public static string exceptionStackTrace { get; set; }
         public Dialogs.ExceptionDialog exceptionDialog;
@@ -264,6 +527,12 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 
 
                 }
+                watcher = DeviceInformation.CreateWatcher(StorageDevice.GetDeviceSelector());
+                watcher.Added += DeviceAdded;
+                watcher.Removed += DeviceRemoved;
+                watcher.Updated += DeviceUpdated;
+                watcher.EnumerationCompleted += Watcher_EnumerationCompleted;
+                watcher.Start();
                 // Ensure the current window is active
                 Window.Current.Activate();
 
@@ -294,6 +563,12 @@ protected override void OnActivated(IActivatedEventArgs args)
                     rootFrame.Navigate(typeof(InstanceTabsView), @trimmedPath, new SuppressNavigationTransitionInfo());
                 }
                 // Ensure the current window is active.
+                watcher = DeviceInformation.CreateWatcher(StorageDevice.GetDeviceSelector());
+                watcher.Added += DeviceAdded;
+                watcher.Removed += DeviceRemoved;
+                watcher.Updated += DeviceUpdated;
+                watcher.EnumerationCompleted += Watcher_EnumerationCompleted;
+                watcher.Start();
                 Window.Current.Activate();
                 return;
             }
@@ -329,6 +604,7 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
         {
             var deferral = e.SuspendingOperation.GetDeferral();
             //TODO: Save application state and stop any background activity
+            watcher.Stop();
             deferral.Complete();
         }
     }
diff --git a/Files UWP/Assets/Files UWP Icon.png b/Files UWP/Assets/Files UWP Icon.png
new file mode 100644
index 000000000000..5e239ec227b7
Binary files /dev/null and b/Files UWP/Assets/Files UWP Icon.png differ
diff --git a/Files UWP/Dialogs/ExtractFilesDialog.xaml b/Files UWP/Dialogs/ExtractFilesDialog.xaml
new file mode 100644
index 000000000000..00cec3272f0c
--- /dev/null
+++ b/Files UWP/Dialogs/ExtractFilesDialog.xaml	
@@ -0,0 +1,30 @@
+<ContentDialog
+    x:Class="Files.Dialogs.ExtractFilesDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Files.Dialogs"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    CornerRadius="4"
+    Title="Extract Compressed Archive"
+    PrimaryButtonText="Extract"
+    CloseButtonText="Cancel"
+    DefaultButton="Primary"
+    PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
+    CloseButtonClick="ContentDialog_CloseButtonClick">
+
+    <Grid MinWidth="375">
+        <StackPanel Orientation="Vertical">
+            <TextBlock TextWrapping="WrapWholeWords" Text="Pick a location to extract this compressed archive to. You'll need to stay in the current folder until we're done. A new tab will open up with the extracted items."/>
+            <Grid ColumnSpacing="5" Margin="0,14,0,0" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="75*"/>
+                    <ColumnDefinition Width="25*"/>
+                </Grid.ColumnDefinitions>
+                <TextBox x:Name="DestPathText" Grid.Column="0"/>
+                <Button x:Name="BrowseButton" Grid.Column="1" Content="Browse" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BrowseButton_Click"/>
+            </Grid>
+        </StackPanel>
+    </Grid>
+</ContentDialog>
diff --git a/Files UWP/Dialogs/ExtractFilesDialog.xaml.cs b/Files UWP/Dialogs/ExtractFilesDialog.xaml.cs
new file mode 100644
index 000000000000..b62e1099590d
--- /dev/null
+++ b/Files UWP/Dialogs/ExtractFilesDialog.xaml.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace Files.Dialogs
+{
+    public sealed partial class ExtractFilesDialog : ContentDialog
+    {
+        public ExtractFilesDialog(string currentDirectory)
+        {
+            this.InitializeComponent();
+            DestPathText.Text = currentDirectory;
+            Windows.Storage.ApplicationData.Current.LocalSettings.Values["Extract_Destination_Path"] = currentDirectory;
+        }
+
+        private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            Windows.Storage.ApplicationData.Current.LocalSettings.Values["Extract_Destination_Cancelled"] = false;
+        }
+
+ 
+
+        private async void BrowseButton_Click(object sender, RoutedEventArgs e)
+        {
+            Windows.Storage.Pickers.FolderPicker folderPicker = new Windows.Storage.Pickers.FolderPicker();
+            folderPicker.CommitButtonText = "Select Folder";
+            folderPicker.FileTypeFilter.Add("*");
+            var selectedFolder = await folderPicker.PickSingleFolderAsync();
+            if(selectedFolder != null)
+            {
+                DestPathText.Text = selectedFolder.Path;
+                Windows.Storage.ApplicationData.Current.LocalSettings.Values["Extract_Destination_Path"] = selectedFolder.Path;
+            }
+        }
+
+        private void ContentDialog_CloseButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            Windows.Storage.ApplicationData.Current.LocalSettings.Values["Extract_Destination_Cancelled"] = true;
+        }
+    }
+}
diff --git a/Files UWP/FilesUWP.csproj b/Files UWP/FilesUWP.csproj
index 1c250b6ce37c..984ea7311a26 100644
--- a/Files UWP/FilesUWP.csproj	
+++ b/Files UWP/FilesUWP.csproj	
@@ -131,6 +131,9 @@
     <Compile Include="Dialogs\ExceptionDialog.xaml.cs">
       <DependentUpon>ExceptionDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\ExtractFilesDialog.xaml.cs">
+      <DependentUpon>ExtractFilesDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\LayoutDialog.xaml.cs">
       <DependentUpon>LayoutDialog.xaml</DependentUpon>
     </Compile>
@@ -146,6 +149,7 @@
     <Compile Include="Filesystem\DriveItem.cs" />
     <Compile Include="Filesystem\ItemViewModel.cs" />
     <Compile Include="Filesystem\ListedItem.cs" />
+    <Compile Include="Filesystem\SidebarItem.cs" />
     <Compile Include="GenericFileBrowser.xaml.cs">
       <DependentUpon>GenericFileBrowser.xaml</DependentUpon>
     </Compile>
@@ -198,6 +202,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Assets\Files UWP Icon.png" />
     <Content Include="Assets\FilesHome.png" />
     <Content Include="Assets\FilesDrive.png" />
     <Content Include="Assets\logo.bmp" />
@@ -225,6 +230,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\ExtractFilesDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\LayoutDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Files UWP/Filesystem/DriveItem.cs b/Files UWP/Filesystem/DriveItem.cs
index 5a5ea71206db..3f2945400df9 100644
--- a/Files UWP/Filesystem/DriveItem.cs	
+++ b/Files UWP/Filesystem/DriveItem.cs	
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media.Imaging;
 
 namespace Files.Filesystem
 {
@@ -16,5 +17,8 @@ public class DriveItem
         public string tag { get; set; }
         public Visibility progressBarVisibility { get; set; }
         public string spaceText { get; set; }
+        public Visibility cloudGlyphVisibility { get; set; } = Visibility.Collapsed;
+        public Visibility driveGlyphVisibility { get; set; } = Visibility.Visible;
+
     }
 }
diff --git a/Files UWP/Filesystem/SidebarItem.cs b/Files UWP/Filesystem/SidebarItem.cs
new file mode 100644
index 000000000000..e95450f79766
--- /dev/null
+++ b/Files UWP/Filesystem/SidebarItem.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Files.Filesystem
+{
+    public class SidebarItem
+    {
+        public string IconGlyph { get; set; }
+
+        public string Text { get; set; }
+
+        public bool isDefaultLocation { get; set; } = false;
+
+        public string Path { get; set; } = null;
+    }
+}
diff --git a/Files UWP/GenericFileBrowser.xaml b/Files UWP/GenericFileBrowser.xaml
index 5f1d3a5caf3c..e3dd9fe2e5e7 100644
--- a/Files UWP/GenericFileBrowser.xaml	
+++ b/Files UWP/GenericFileBrowser.xaml	
@@ -244,6 +244,11 @@
                     <Setter Property="ContextFlyout">
                         <Setter.Value>
                             <MenuFlyout Opened="RightClickContextMenu_Opened" x:Name="RightClickContextMenu" MenuFlyoutPresenterStyle="{StaticResource MenuFlyoutFluentThemeResources}">
+                                <MenuFlyoutItem Text="Extract" x:Name="UnzipItem">
+                                    <MenuFlyoutItem.Icon>
+                                        <FontIcon Glyph="&#xED25;"/>
+                                    </MenuFlyoutItem.Icon>
+                                </MenuFlyoutItem>
                                 <MenuFlyoutItem Text="Open with..." x:Name="OpenItem">
                                     <MenuFlyoutItem.Icon>
                                         <FontIcon Glyph="&#xE7AC;"/>
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
index ede2457a196d..93d55ff3c202 100644
--- a/Files UWP/GenericFileBrowser.xaml.cs	
+++ b/Files UWP/GenericFileBrowser.xaml.cs	
@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Uwp.UI;
+using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using System;
 using System.ComponentModel;
@@ -11,9 +11,12 @@
 using Files.Filesystem;
 using Files.Interacts;
 using System.IO;
+using Windows.UI.Xaml.Media;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Windows.System;
 using Windows.UI.Xaml.Input;
+using System.Linq;
 
 namespace Files
 {
@@ -108,9 +111,10 @@ public GenericFileBrowser()
             NewFolder.Click += tabInstance.instanceInteraction.NewFolder_Click;
             NewBitmapImage.Click += tabInstance.instanceInteraction.NewBitmapImage_Click;
             NewTextDocument.Click += tabInstance.instanceInteraction.NewTextDocument_Click;
+            UnzipItem.Click += tabInstance.instanceInteraction.ExtractItems_Click;
             PropertiesItem.Click += tabInstance.ShowPropertiesButton_Click;
             OpenInNewWindowItem.Click += tabInstance.instanceInteraction.OpenInNewWindowItem_Click;
-            
+
             switch (viewModelInstance.DirectorySortOption)
             {
                 case SortOption.Name:
@@ -148,7 +152,8 @@ private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e
                         SortedColumn = sizeColumn;
                         break;
                 }
-            } else if (e.PropertyName == "DirectorySortDirection")
+            }
+            else if (e.PropertyName == "DirectorySortDirection")
             {
                 // Swap arrows
                 SortedColumn = _sortedColumn;
@@ -179,7 +184,7 @@ private void Clipboard_ContentChanged(object sender, object e)
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
             base.OnNavigatedTo(eventArgs);
-            
+
             tabInstance.BackButton.IsEnabled = tabInstance.accessibleContentFrame.CanGoBack;
             tabInstance.ForwardButton.IsEnabled = tabInstance.accessibleContentFrame.CanGoForward;
             tabInstance.RefreshButton.IsEnabled = true;
@@ -252,13 +257,13 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
                     data.Columns[0].GetCellContent(dataGridRow).Opacity = 1;
                 }
             }
-            
+
         }
 
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         {
             base.OnNavigatingFrom(e);
-            if(tabInstance.instanceViewModel._fileQueryResult != null)
+            if (tabInstance.instanceViewModel._fileQueryResult != null)
             {
                 tabInstance.instanceViewModel._fileQueryResult.ContentsChanged -= tabInstance.instanceViewModel.FileContentsChanged;
             }
@@ -269,24 +274,24 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         private void AllView_DragOver(object sender, DragEventArgs e)
         {
             e.AcceptedOperation = DataPackageOperation.Copy;
-            
+
         }
 
         private async void AllView_DropAsync(object sender, DragEventArgs e)
         {
             if (e.DataView.Contains(StandardDataFormats.StorageItems))
             {
-                    foreach (IStorageItem item in await e.DataView.GetStorageItemsAsync())
+                foreach (IStorageItem item in await e.DataView.GetStorageItemsAsync())
+                {
+                    if (item.IsOfType(StorageItemTypes.Folder))
                     {
-                        if (item.IsOfType(StorageItemTypes.Folder))
-                        {
-                            tabInstance.instanceInteraction.CloneDirectoryAsync((item as StorageFolder).Path, tabInstance.instanceViewModel.Universal.path, (item as StorageFolder).DisplayName);
-                        }
-                        else
-                        {
-                            await (item as StorageFile).CopyAsync(await StorageFolder.GetFolderFromPathAsync(tabInstance.instanceViewModel.Universal.path));
-                        }
+                        tabInstance.instanceInteraction.CloneDirectoryAsync((item as StorageFolder).Path, tabInstance.instanceViewModel.Universal.path, (item as StorageFolder).DisplayName);
                     }
+                    else
+                    {
+                        await (item as StorageFile).CopyAsync(await StorageFolder.GetFolderFromPathAsync(tabInstance.instanceViewModel.Universal.path));
+                    }
+                }
             }
         }
 
@@ -338,13 +343,13 @@ private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Inpu
         private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             AllView.CommitEdit();
-            if(e.AddedItems.Count > 0)
+            if (e.AddedItems.Count > 0)
             {
                 tabInstance.HomeItems.isEnabled = true;
                 tabInstance.ShareItems.isEnabled = true;
 
             }
-            else if(data.SelectedItems.Count == 0)
+            else if (data.SelectedItems.Count == 0)
             {
                 tabInstance.HomeItems.isEnabled = false;
                 tabInstance.ShareItems.isEnabled = false;
@@ -373,26 +378,58 @@ private void AllView_DragStarting(UIElement sender, DragStartingEventArgs args)
 
         private void AllView_DragLeave(object sender, DragEventArgs e)
         {
-            
+
         }
 
         private void RightClickContextMenu_Opened(object sender, object e)
         {
             var selectedDataItem = AllView.SelectedItem as ListedItem;
-            if (selectedDataItem.FileType != "Folder" || AllView.SelectedItems.Count > 1)
+
+            // Search selected items for non-Folders
+            if(AllView.SelectedItems.Cast<ListedItem>().Any(x => x.FileType != "Folder"))
             {
                 SidebarPinItem.Visibility = Visibility.Collapsed;
                 OpenInNewTab.Visibility = Visibility.Collapsed;
                 OpenInNewWindowItem.Visibility = Visibility.Collapsed;
+                if (AllView.SelectedItems.Count == 1)
+                {
+                    if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                    {
+                        OpenItem.Visibility = Visibility.Collapsed;
+                        UnzipItem.Visibility = Visibility.Collapsed;
+                    }
+                    else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                    {
+                        OpenItem.Visibility = Visibility.Visible;
+                        UnzipItem.Visibility = Visibility.Collapsed;
+                    }
+                }
+                else if (AllView.SelectedItems.Count > 1)
+                {
+                    OpenItem.Visibility = Visibility.Collapsed;
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
             }
-            else if (selectedDataItem.FileType == "Folder")
+            else     // All are Folders
             {
-                SidebarPinItem.Visibility = Visibility.Visible;
-                OpenInNewTab.Visibility = Visibility.Visible;
-                OpenInNewWindowItem.Visibility = Visibility.Visible;
+                OpenItem.Visibility = Visibility.Collapsed;
+                if (AllView.SelectedItems.Count <= 5 && AllView.SelectedItems.Count > 0)
+                {
+                    SidebarPinItem.Visibility = Visibility.Visible;
+                    OpenInNewTab.Visibility = Visibility.Visible;
+                    OpenInNewWindowItem.Visibility = Visibility.Visible;
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
+                else if (AllView.SelectedItems.Count > 5)
+                {
+                    SidebarPinItem.Visibility = Visibility.Visible;
+                    OpenInNewTab.Visibility = Visibility.Collapsed;
+                    OpenInNewWindowItem.Visibility = Visibility.Collapsed;
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
+                
             }
         }
-
         private void AllView_Sorting(object sender, DataGridColumnEventArgs e)
         {
             if (e.Column == SortedColumn)
@@ -400,7 +437,7 @@ private void AllView_Sorting(object sender, DataGridColumnEventArgs e)
             else if (e.Column != iconColumn)
                 SortedColumn = e.Column;
         }
-        
+
         private void AllView_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key == VirtualKey.Enter)
@@ -410,7 +447,7 @@ private void AllView_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
             }
         }
     }
-  
+
     public class EmptyFolderTextState : INotifyPropertyChanged
     {
         public Visibility _isVisible;
@@ -437,4 +474,4 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Files UWP/Interacts/Interaction.cs b/Files UWP/Interacts/Interaction.cs
index 8f963dc0c446..41b379a7345d 100644
--- a/Files UWP/Interacts/Interaction.cs	
+++ b/Files UWP/Interacts/Interaction.cs	
@@ -23,6 +23,8 @@
 using System.IO;
 using System.Reflection;
 using Files.Dialogs;
+using System.IO.Compression;
+using System.Linq;
 
 namespace Files.Interacts
 {
@@ -45,36 +47,49 @@ public void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)
         public async void OpenInNewWindowItem_Click(object sender, RoutedEventArgs e)
         {
             var CurrentSourceType = App.selectedTabInstance.accessibleContentFrame.CurrentSourcePageType;
-            int index = -1;
             if (CurrentSourceType == typeof(GenericFileBrowser))
             {
-                index = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedIndex;
+                var items = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedItems;
+                foreach (ListedItem listedItem in items)
+                {
+                    var selectedItemPath = listedItem.FilePath;
+                    var folderUri = new Uri("files-uwp:" + "?folder=" + @selectedItemPath);
+                    await Launcher.LaunchUriAsync(folderUri);
+                }
+
             }
             else if (CurrentSourceType == typeof(PhotoAlbum))
             {
-                index = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedIndex;
+                var items = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItems;
+                foreach (ListedItem listedItem in items)
+                {
+                    var selectedItemPath = listedItem.FilePath;
+                    var folderUri = new Uri("files-uwp:" + "?folder=" + @selectedItemPath);
+                    await Launcher.LaunchUriAsync(folderUri);
+                }
             }
-            var selectedItemPath = tabInstance.instanceViewModel.FilesAndFolders[index].FilePath;
-            var folderUri = new Uri("files-uwp:" + "?folder=" + @selectedItemPath);
-
-            await Launcher.LaunchUriAsync(folderUri);
         }
 
         public void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
         {
             var CurrentSourceType = App.selectedTabInstance.accessibleContentFrame.CurrentSourcePageType;
-            int index = -1;
             if(CurrentSourceType == typeof(GenericFileBrowser))
             {
-                index = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedIndex;
+                var items = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedItems;
+                foreach (ListedItem listedItem in items)
+                {
+                    instanceTabsView.AddNewTab(typeof(ProHome), listedItem.FilePath);
+                }
+                
             }
             else if(CurrentSourceType == typeof(PhotoAlbum))
             {
-                index = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedIndex;
+                var items = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItems;
+                foreach (ListedItem listedItem in items)
+                {
+                    instanceTabsView.AddNewTab(typeof(ProHome), listedItem.FilePath);
+                }
             }
-            var selectedItemPath = tabInstance.instanceViewModel.FilesAndFolders[index].FilePath;
-
-            instanceTabsView.AddNewTab(typeof(ProHome), selectedItemPath);
         }
 
         public async void OpenDirectoryInTerminal(object sender, RoutedEventArgs e)
@@ -97,46 +112,144 @@ public async void PinItem_Click(object sender, RoutedEventArgs e)
         {
             if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
             {
-                var selectedDataItem = tabInstance.instanceViewModel.FilesAndFolders[(tabInstance.accessibleContentFrame.Content as GenericFileBrowser).AllView.SelectedIndex];
                 StorageFolder cacheFolder = Windows.Storage.ApplicationData.Current.LocalCacheFolder;
+                List<string> items = new List<string>();
 
                 try
                 {
-                    List<string> items = new List<string>();
-                    items.Add(selectedDataItem.FilePath);
+                    foreach (ListedItem listedItem in (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).AllView.SelectedItems)
+                    {
+                        items.Add(listedItem.FilePath);
+                    }
                     var ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
                     await FileIO.AppendLinesAsync(ListFile, items);
                 }
                 catch (FileNotFoundException)
                 {
-                    List<string> items = new List<string>();
-                    items.Add(selectedDataItem.FilePath);
+                    foreach (ListedItem listedItem in (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).AllView.SelectedItems)
+                    {
+                        items.Add(listedItem.FilePath);
+                    }
                     var createdListFile = await cacheFolder.CreateFileAsync("PinnedItems.txt");
                     await FileIO.WriteLinesAsync(createdListFile, items);
-                } 
+                }
+                finally
+                {
+                    foreach (string itemPath in items)
+                    {
+                        try
+                        {
+                            StorageFolder fol = await StorageFolder.GetFolderFromPathAsync(itemPath);
+                            var name = fol.DisplayName;
+                            var content = name;
+                            var icon = "\uE8B7";
+
+                            bool isDuplicate = false;
+                            foreach (SidebarItem sbi in App.sideBarItems)
+                            {
+                                if (!string.IsNullOrWhiteSpace(sbi.Path) && !sbi.isDefaultLocation)
+                                {
+                                    if (sbi.Path.ToString() == itemPath)
+                                    {
+                                        isDuplicate = true;
+
+                                    }
+                                }
+                                
+                            }
+
+                            if (!isDuplicate)
+                            {
+                                App.sideBarItems.Add(new SidebarItem() { Path = itemPath, IconGlyph = icon, isDefaultLocation = false, Text = content });
+                            }
+                        }
+                        catch (UnauthorizedAccessException ex)
+                        {
+                            Debug.WriteLine(ex.Message);
+                        }
+                        catch (FileNotFoundException ex)
+                        {
+                            Debug.WriteLine("Pinned item was deleted and will be removed from the file lines list soon: " + ex.Message);
+                            App.LinesToRemoveFromFile.Add(itemPath);
+                        }
+                        catch (System.Runtime.InteropServices.COMException ex)
+                        {
+                            Debug.WriteLine("Pinned item's drive was ejected and will be removed from the file lines list soon: " + ex.Message);
+                            App.LinesToRemoveFromFile.Add(itemPath);
+                        }
+                    }
+                }
             }
             else if(App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
             {
-                var selectedDataItem = tabInstance.instanceViewModel.FilesAndFolders[(tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedIndex];
                 StorageFolder cacheFolder = Windows.Storage.ApplicationData.Current.LocalCacheFolder;
+                List<string> items = new List<string>();
 
                 try
                 {
-                    List<string> items = new List<string>();
-                    items.Add(selectedDataItem.FilePath);
+                    foreach (ListedItem listedItem in (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItems)
+                    {
+                        items.Add(listedItem.FilePath);
+                    }
                     var ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
                     await FileIO.AppendLinesAsync(ListFile, items);
                 }
                 catch (FileNotFoundException)
                 {
-                    List<string> items = new List<string>();
-                    items.Add(selectedDataItem.FilePath);
+                    foreach (ListedItem listedItem in (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItems)
+                    {
+                        items.Add(listedItem.FilePath);
+                    }
                     var createdListFile = await cacheFolder.CreateFileAsync("PinnedItems.txt");
                     await FileIO.WriteLinesAsync(createdListFile, items);
                 }
+                finally
+                {
+                    foreach (string itemPath in items)
+                    {
+                        try
+                        {
+                            StorageFolder fol = await StorageFolder.GetFolderFromPathAsync(itemPath);
+                            var name = fol.DisplayName;
+                            var content = name;
+                            var icon = "\uE8B7";
+
+                            bool isDuplicate = false;
+                            foreach (SidebarItem sbi in App.sideBarItems)
+                            {
+                                if (!string.IsNullOrWhiteSpace(sbi.Path) && !sbi.isDefaultLocation)
+                                {
+                                    if (sbi.Path.ToString() == itemPath)
+                                    {
+                                        isDuplicate = true;
+
+                                    }
+                                }
+                            }
+
+                            if (!isDuplicate)
+                            {
+                                App.sideBarItems.Add(new SidebarItem() { Path = itemPath, IconGlyph = icon, isDefaultLocation = false, Text = content });
+                            }
+                        }
+                        catch (UnauthorizedAccessException ex)
+                        {
+                            Debug.WriteLine(ex.Message);
+                        }
+                        catch (FileNotFoundException ex)
+                        {
+                            Debug.WriteLine("Pinned item was deleted and will be removed from the file lines list soon: " + ex.Message);
+                            App.LinesToRemoveFromFile.Add(itemPath);
+                        }
+                        catch (System.Runtime.InteropServices.COMException ex)
+                        {
+                            Debug.WriteLine("Pinned item's drive was ejected and will be removed from the file lines list soon: " + ex.Message);
+                            App.LinesToRemoveFromFile.Add(itemPath);
+                        }
+                    }
+                }
             }
-            var CurrentInstance = App.selectedTabInstance;
-            CurrentInstance.PopulatePinnedSidebarItems();
+            App.RemoveStaleSidebarItems();
         }
 
         public void GetPath_Click(object sender, RoutedEventArgs e)
@@ -155,22 +268,16 @@ public void GetPath_Click(object sender, RoutedEventArgs e)
                 Clipboard.SetContent(data);
                 Clipboard.Flush();
             }
-            // Eventually notify user via flyout            
-
         }
 
         public static async Task LaunchExe(string ApplicationPath)
         {
             Debug.WriteLine("Launching EXE in FullTrustProcess");
             ApplicationData.Current.LocalSettings.Values["Application"] = ApplicationPath;
+            ApplicationData.Current.LocalSettings.Values["Arguments"] = null;
             await FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync();
         }
 
-        public async void CommandInvokedHandler(IUICommand command)
-        {
-            await Launcher.LaunchUriAsync(new Uri("ms-windows-store://home"));
-        }
-
         public async void GrantAccessPermissionHandler(IUICommand command)
         {
             await Launcher.LaunchUriAsync(new Uri("ms-settings:privacy-broadfilesystemaccess"));
@@ -238,112 +345,106 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
             try
             {
                 IEnumerable selectedItems;
+                string selectedItemPath = null;
                 int selectedItemCount;
                 Type sourcePageType = App.selectedTabInstance.accessibleContentFrame.SourcePageType;
                 if (sourcePageType == typeof(GenericFileBrowser))
                 {
-                    DataGrid data =(tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data;
+                    DataGrid data = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data;
                     selectedItems = data.SelectedItems;
                     selectedItemCount = data.SelectedItems.Count;
+                    if(selectedItemCount == 1)
+                    {
+                        selectedItemPath = (data.SelectedItem as ListedItem).FilePath;
+                    }
                 }
                 else
                 {
                     GridView gv = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv;
                     selectedItems = gv.SelectedItems;
                     selectedItemCount = gv.SelectedItems.Count;
+                    if (selectedItemCount == 1)
+                    {
+                        selectedItemPath = (gv.SelectedItem as ListedItem).FilePath;
+                    }
                 }
-                foreach (ListedItem clickedOnItem in selectedItems)
-                {
-                    // Access MRU List
-                    var mostRecentlyUsed = Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList;
 
+                // Access MRU List
+                var mostRecentlyUsed = Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList;
+
+                if (selectedItemCount == 1)
+                {
+                    var clickedOnItem = selectedItems.Cast<ListedItem>().ToList()[0];
                     if (clickedOnItem.FileType == "Folder")
                     {
-                        if (selectedItemCount == 1)
-                        {
-                            // Add location to MRU List
-                            mostRecentlyUsed.Add(await StorageFolder.GetFolderFromPathAsync(clickedOnItem.FilePath));
+                        // Add location to MRU List
+                        mostRecentlyUsed.Add(await StorageFolder.GetFolderFromPathAsync(selectedItemPath));
 
-                            tabInstance.instanceViewModel.Universal.path = clickedOnItem.FilePath;
-                            tabInstance.PathText.Text = clickedOnItem.FilePath;
-                            if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
-                            {
-                                (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).TextState.isVisible = Visibility.Collapsed;
-                            }
-                            else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
-                            {
-                                (tabInstance.accessibleContentFrame.Content as PhotoAlbum).TextState.isVisible = Visibility.Collapsed;
-                            }
-                            tabInstance.FS.isEnabled = false;
-                            if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
-                            {
-                                tabInstance.PathText.Text = "Desktop";
-                                tabInstance.locationsList.SelectedIndex = 1;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.DesktopPath, new SuppressNavigationTransitionInfo());
+                        tabInstance.instanceViewModel.Universal.path = selectedItemPath;
+                        tabInstance.PathText.Text = selectedItemPath;
+                        if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
+                        {
+                            (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).TextState.isVisible = Visibility.Collapsed;
+                        }
+                        else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
+                        {
+                            (tabInstance.accessibleContentFrame.Content as PhotoAlbum).TextState.isVisible = Visibility.Collapsed;
+                        }
+                        tabInstance.FS.isEnabled = false;
+                        if (selectedItemPath == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
+                        {
+                            tabInstance.PathText.Text = "Desktop";
+                            tabInstance.locationsList.SelectedIndex = 1;
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.DesktopPath, new SuppressNavigationTransitionInfo());
 
-                            }
-                            else if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
-                            {
-                                tabInstance.PathText.Text = "Documents";
-                                tabInstance.locationsList.SelectedIndex = 3;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.DocumentsPath, new SuppressNavigationTransitionInfo());
-                            }
-                            else if (clickedOnItem.FilePath == (Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\Downloads"))
-                            {
-                                tabInstance.PathText.Text = "Downloads";
-                                tabInstance.locationsList.SelectedIndex = 2;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.DownloadsPath, new SuppressNavigationTransitionInfo());
-                            }
-                            else if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.MyPictures))
-                            {
-                                tabInstance.PathText.Text = "Pictures";
-                                tabInstance.locationsList.SelectedIndex = 4;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.PicturesPath, new SuppressNavigationTransitionInfo());
-                            }
-                            else if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.MyMusic))
-                            {
-                                tabInstance.PathText.Text = "Music";
-                                tabInstance.locationsList.SelectedIndex = 5;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.MusicPath, new SuppressNavigationTransitionInfo());
-                            }
-                            else if (clickedOnItem.FilePath == (Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\OneDrive"))
-                            {
-                                tabInstance.PathText.Text = "OneDrive";
-                                tabInstance.drivesList.SelectedIndex = 1;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.OneDrivePath, new SuppressNavigationTransitionInfo());
-                            }
-                            else if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.MyVideos))
+                        }
+                        else if (selectedItemPath == Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
+                        {
+                            tabInstance.PathText.Text = "Documents";
+                            tabInstance.locationsList.SelectedIndex = 3;
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.DocumentsPath, new SuppressNavigationTransitionInfo());
+                        }
+                        else if (selectedItemPath == (Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\Downloads"))
+                        {
+                            tabInstance.PathText.Text = "Downloads";
+                            tabInstance.locationsList.SelectedIndex = 2;
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.DownloadsPath, new SuppressNavigationTransitionInfo());
+                        }
+                        else if (selectedItemPath == Environment.GetFolderPath(Environment.SpecialFolder.MyPictures))
+                        {
+                            tabInstance.PathText.Text = "Pictures";
+                            tabInstance.locationsList.SelectedIndex = 4;
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.PicturesPath, new SuppressNavigationTransitionInfo());
+                        }
+                        else if (selectedItemPath == Environment.GetFolderPath(Environment.SpecialFolder.MyMusic))
+                        {
+                            tabInstance.PathText.Text = "Music";
+                            tabInstance.locationsList.SelectedIndex = 5;
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.MusicPath, new SuppressNavigationTransitionInfo());
+                        }
+                        else if (selectedItemPath == (Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\OneDrive"))
+                        {
+                            tabInstance.PathText.Text = "OneDrive";
+                            tabInstance.drivesList.SelectedItem = tabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "OneDrive").First();
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.OneDrivePath, new SuppressNavigationTransitionInfo());
+                        }
+                        else if (selectedItemPath == Environment.GetFolderPath(Environment.SpecialFolder.MyVideos))
+                        {
+                            tabInstance.PathText.Text = "Videos";
+                            tabInstance.locationsList.SelectedIndex = 6;
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.VideosPath, new SuppressNavigationTransitionInfo());
+                        }
+                        else
+                        {
+                            if (selectedItemPath.Split(@"\")[0].Contains("C:"))
                             {
-                                tabInstance.PathText.Text = "Videos";
-                                if (sourcePageType == typeof(GenericFileBrowser))
-                                    tabInstance.locationsList.SelectedIndex = 6;
-                                else
-                                    tabInstance.drivesList.SelectedIndex = 6;
-                                tabInstance.accessibleContentFrame.Navigate(sourcePageType, YourHome.VideosPath, new SuppressNavigationTransitionInfo());
+                                tabInstance.drivesList.SelectedItem = tabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                if (sourcePageType == typeof(GenericFileBrowser))
-                                {
-                                    if (clickedOnItem.FilePath.Split(@"\")[0].Contains("C:"))
-                                    {
-                                        tabInstance.drivesList.SelectedIndex = 0;
-                                    }
-                                    tabInstance.instanceViewModel.Universal.path = clickedOnItem.FilePath;
-                                    tabInstance.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), tabInstance.instanceViewModel.Universal.path, new SuppressNavigationTransitionInfo());
-                                }
-                                else
-                                {
-                                    tabInstance.drivesList.SelectedIndex = 0; if (clickedOnItem.FilePath.Split(@"\")[0].Contains("C:"))
-                                        tabInstance.PathText.Text = clickedOnItem.FilePath;
-                                    tabInstance.accessibleContentFrame.Navigate(typeof(PhotoAlbum), clickedOnItem.FilePath, new SuppressNavigationTransitionInfo());
-                                }
+                                tabInstance.drivesList.SelectedItem = tabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.Contains(selectedItemPath.Split(@"\")[0])).First();
                             }
-                        }
-                        else
-                        {
-                            var selectedItemPath = clickedOnItem.FilePath;
-                            instanceTabsView.AddNewTab(typeof(ProHome), selectedItemPath);
+                            tabInstance.accessibleContentFrame.Navigate(sourcePageType, selectedItemPath, new SuppressNavigationTransitionInfo());
                         }
                     }
                     else if (clickedOnItem.FileType == "Application")
@@ -364,6 +465,34 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
                         await Launcher.LaunchFileAsync(file, options);
                     }
                 }
+                else if(selectedItemCount > 1)
+                {
+                    foreach (ListedItem clickedOnItem in selectedItems)
+                    {
+
+                        if (clickedOnItem.FileType == "Folder")
+                        {
+                            instanceTabsView.AddNewTab(typeof(ProHome), clickedOnItem.FilePath);
+                        }
+                        else if (clickedOnItem.FileType == "Application")
+                        {
+                            // Add location to MRU List
+                            mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));
+                            await LaunchExe(clickedOnItem.FilePath);
+                        }
+                        else
+                        {
+                            StorageFile file = await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath);
+                            // Add location to MRU List
+                            mostRecentlyUsed.Add(file);
+                            var options = new LauncherOptions
+                            {
+                                DisplayApplicationPicker = displayApplicationPicker
+                            };
+                            await Launcher.LaunchFileAsync(file, options);
+                        }
+                    }
+                }
             }
             catch (FileNotFoundException)
             {
@@ -898,6 +1027,72 @@ public void NewBitmapImage_Click(object sender, RoutedEventArgs e)
             AddItem.CreateFile(tabInstance, "Bitmap Image");
         }
 
+        public async void ExtractItems_Click(object sender, RoutedEventArgs e)
+        {
+            StorageFile selectedItem = null;
+            if (tabInstance.accessibleContentFrame.CurrentSourcePageType == typeof(GenericFileBrowser))
+            {
+                var page = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser);
+                selectedItem = await StorageFile.GetFileFromPathAsync(tabInstance.instanceViewModel.FilesAndFolders[page.data.SelectedIndex].FilePath);
+
+            }
+            else if (tabInstance.accessibleContentFrame.CurrentSourcePageType == typeof(PhotoAlbum))
+            {
+                var page = (tabInstance.accessibleContentFrame.Content as PhotoAlbum);
+                selectedItem = await StorageFile.GetFileFromPathAsync(tabInstance.instanceViewModel.FilesAndFolders[page.gv.SelectedIndex].FilePath);
+            }
+            string destinationPath = null;
+            ExtractFilesDialog extractFilesDialog = new ExtractFilesDialog(tabInstance.instanceViewModel.Universal.path);
+            await extractFilesDialog.ShowAsync();
+            if (((bool)ApplicationData.Current.LocalSettings.Values["Extract_Destination_Cancelled"]) == false)
+            {
+                var bufferItem = await selectedItem.CopyAsync(ApplicationData.Current.TemporaryFolder, selectedItem.DisplayName, NameCollisionOption.ReplaceExisting);
+                destinationPath = ApplicationData.Current.LocalSettings.Values["Extract_Destination_Path"].ToString();
+                //ZipFile.ExtractToDirectory(selectedItem.Path, destinationPath, );
+                var destFolder_InBuffer = await ApplicationData.Current.TemporaryFolder.CreateFolderAsync(selectedItem.DisplayName + "_Extracted", CreationCollisionOption.ReplaceExisting);
+                using(FileStream fs = new FileStream(bufferItem.Path, FileMode.Open))
+                {
+                    ZipArchive zipArchive = new ZipArchive(fs);
+                    int totalCount = zipArchive.Entries.Count;
+                    int index = 0;
+                    if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
+                    {
+                        (App.selectedTabInstance.accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Visible;
+                    }
+                    else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
+                    {
+                        (App.selectedTabInstance.accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Visible;
+                    }
+
+                    foreach (ZipArchiveEntry archiveEntry in zipArchive.Entries)
+                    {
+                        archiveEntry.ExtractToFile(destFolder_InBuffer.Path + "\\" + archiveEntry.Name);
+                        index++;
+                        if (index == totalCount)
+                        {
+                            if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
+                            {
+                                (App.selectedTabInstance.accessibleContentFrame.Content as GenericFileBrowser).progressBar.Visibility = Visibility.Collapsed;
+                            }
+                            else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
+                            {
+                                (App.selectedTabInstance.accessibleContentFrame.Content as PhotoAlbum).progressBar.Visibility = Visibility.Collapsed;
+                            }
+                        }
+                    }
+                    CloneDirectoryAsync(destFolder_InBuffer.Path, destinationPath, destFolder_InBuffer.Name);
+                    await destFolder_InBuffer.DeleteAsync(StorageDeleteOption.PermanentDelete);
+                    Frame rootFrame = Window.Current.Content as Frame;
+                    var instanceTabsView = rootFrame.Content as InstanceTabsView;
+                    instanceTabsView.AddNewTab(typeof(ProHome), destinationPath + "\\" + selectedItem.DisplayName);
+                }
+            }
+            else if (((bool)ApplicationData.Current.LocalSettings.Values["Extract_Destination_Cancelled"]) == true)
+            {
+                return;
+            }
+        }
+
         public void SelectAllItems()
         {
             if(App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
diff --git a/Files UWP/PhotoAlbum.xaml b/Files UWP/PhotoAlbum.xaml
index 0e8b33ed4c21..23371d5be15a 100644
--- a/Files UWP/PhotoAlbum.xaml	
+++ b/Files UWP/PhotoAlbum.xaml	
@@ -451,6 +451,11 @@
                         <Setter.Value>
                             <MenuFlyout Opened="RightClickContextMenu_Opened" x:Name="RightClickContextMenu" MenuFlyoutPresenterStyle="{StaticResource MenuFlyoutFluentThemeResources}">
                                 <MenuFlyout.Items>
+                                    <MenuFlyoutItem Text="Extract" x:Name="UnzipItem">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon Glyph="&#xED25;"/>
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
                                     <MenuFlyoutItem Click="OpenItem_Click" Text="Open With..." Name="OpenItem">
                                         <MenuFlyoutItem.Icon>
                                             <FontIcon Glyph="&#xE7AC;"/>
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
index bade037ab01c..0d5947261cb4 100644
--- a/Files UWP/PhotoAlbum.xaml.cs	
+++ b/Files UWP/PhotoAlbum.xaml.cs	
@@ -26,6 +26,7 @@
 using System.Text.RegularExpressions;
 using Interaction = Files.Interacts.Interaction;
 using Files.Dialogs;
+using System.Linq;
 
 namespace Files
 {
@@ -57,7 +58,15 @@ public PhotoAlbum()
             progressBar = ProgBar;
             gridContext = GridRightClickContextMenu;
             Clipboard.ContentChanged += Clipboard_ContentChanged;
+            Frame rootFrame = Window.Current.Content as Frame;
+            InstanceTabsView instanceTabsView = rootFrame.Content as InstanceTabsView;
+            instanceTabsView.TabStrip_SelectionChanged(null, null);
             tabInstance = App.selectedTabInstance;
+            if (tabInstance.instanceViewModel == null && tabInstance.instanceInteraction == null)
+            {
+                tabInstance.instanceViewModel = new ItemViewModel();
+                tabInstance.instanceInteraction = new Interaction();
+            }
             viewModelInstance = tabInstance.instanceViewModel;
             FileList.DoubleTapped += tabInstance.instanceInteraction.List_ItemClick;
             SidebarPinItem.Click += tabInstance.instanceInteraction.PinItem_Click;
@@ -67,6 +76,8 @@ public PhotoAlbum()
             NewFolder.Click += tabInstance.instanceInteraction.NewFolder_Click;
             NewBitmapImage.Click += tabInstance.instanceInteraction.NewBitmapImage_Click;
             NewTextDocument.Click += tabInstance.instanceInteraction.NewTextDocument_Click;
+            UnzipItem.Click += tabInstance.instanceInteraction.ExtractItems_Click;
+
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
@@ -293,18 +304,51 @@ private void FileList_SelectionChanged(object sender, SelectionChangedEventArgs
 
         private void RightClickContextMenu_Opened(object sender, object e)
         {
-            var selectedDataItem = tabInstance.instanceViewModel.FilesAndFolders[gv.SelectedIndex];
-            if (selectedDataItem.FileType != "Folder" || gv.SelectedItems.Count > 1)
+            var selectedDataItem = gv.SelectedItem as ListedItem;
+
+            // Search selected items for non-Folders
+            if (gv.SelectedItems.Cast<ListedItem>().Any(x => x.FileType != "Folder"))
             {
                 SidebarPinItem.Visibility = Visibility.Collapsed;
                 OpenInNewTab.Visibility = Visibility.Collapsed;
                 OpenInNewWindowItem.Visibility = Visibility.Collapsed;
+                if (gv.SelectedItems.Count == 1)
+                {
+                    if (selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                    {
+                        OpenItem.Visibility = Visibility.Collapsed;
+                        UnzipItem.Visibility = Visibility.Collapsed;
+                    }
+                    else if (!selectedDataItem.DotFileExtension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                    {
+                        OpenItem.Visibility = Visibility.Visible;
+                        UnzipItem.Visibility = Visibility.Collapsed;
+                    }
+                }
+                else if (gv.SelectedItems.Count > 1)
+                {
+                    OpenItem.Visibility = Visibility.Collapsed;
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
             }
-            else if (selectedDataItem.FileType == "Folder")
+            else     // All are Folders
             {
-                SidebarPinItem.Visibility = Visibility.Visible;
-                OpenInNewTab.Visibility = Visibility.Visible;
-                OpenInNewWindowItem.Visibility = Visibility.Visible;
+                OpenItem.Visibility = Visibility.Collapsed;
+                if (gv.SelectedItems.Count <= 5 && gv.SelectedItems.Count > 0)
+                {
+                    SidebarPinItem.Visibility = Visibility.Visible;
+                    OpenInNewTab.Visibility = Visibility.Visible;
+                    OpenInNewWindowItem.Visibility = Visibility.Visible;
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
+                else if (gv.SelectedItems.Count > 5)
+                {
+                    SidebarPinItem.Visibility = Visibility.Visible;
+                    OpenInNewTab.Visibility = Visibility.Collapsed;
+                    OpenInNewWindowItem.Visibility = Visibility.Collapsed;
+                    UnzipItem.Visibility = Visibility.Collapsed;
+                }
+
             }
         }
 
diff --git a/Files UWP/ProHome.xaml b/Files UWP/ProHome.xaml
index 7a1f296e775d..a67ed183ef39 100644
--- a/Files UWP/ProHome.xaml	
+++ b/Files UWP/ProHome.xaml	
@@ -795,6 +795,7 @@
                             <Button.KeyboardAccelerators>
                                 <KeyboardAccelerator Modifiers="Menu" Key="Left"/>
                                 <KeyboardAccelerator Key="XButton1"/>
+                                <KeyboardAccelerator Key="Back"/>
                             </Button.KeyboardAccelerators>
                         </Button>
 
@@ -879,97 +880,55 @@
         </Grid>
         <SplitView DisplayMode="Inline" OpenPaneLength="225" IsPaneOpen="True" HorizontalAlignment="Stretch" Grid.RowSpan="1" Grid.Row="1" VerticalAlignment="Stretch" PaneBackground="{ThemeResource ApplicationPageBackgroundThemeBrush}">
             <SplitView.Pane>
-                <ScrollViewer VerticalScrollBarVisibility="Auto">
-                    <Grid>
+                <ScrollViewer Margin="0,14,0,0" VerticalScrollBarVisibility="Auto">
+                    <Grid >
                         <StackPanel>
                             <StackPanel.Resources>
                                 <SolidColorBrush x:Key="ListViewItemBackgroundSelected" Color="{ThemeResource SystemRevealListMediumColor}"/>
                                 <SolidColorBrush x:Key="ListViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SystemRevealListMediumColor}"/>
                                 <SolidColorBrush x:Key="ListViewItemBackgroundSelectedPressed" Color="{ThemeResource SystemRevealListMediumColor}"/>
                             </StackPanel.Resources>
-                            <TextBlock Margin="10" Text="Locations" FontSize="14" FontWeight="Bold" Padding="0" VerticalAlignment="Stretch"/>
-                            <ListView SelectionChanged="LocationsList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="LocationsList_ItemClick" Name="LocationsList">
+                            <TextBlock Visibility="Collapsed" Margin="10" Text="Locations" FontSize="14" FontWeight="Bold" Padding="0" VerticalAlignment="Stretch"/>
+                            <ListView IsRightTapEnabled="True" RightTapped="LocationsList_RightTapped" ItemsSource="{x:Bind local:App.sideBarItems}" SelectionChanged="LocationsList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="LocationsList_ItemClick" Name="LocationsList">
                                 <ListView.Resources>
-                                    <ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
+                                    <ResourceDictionary>
+                                        <ResourceDictionary.MergedDictionaries>
+                                            <ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
+                                            <ResourceDictionary>
+                                                <MenuFlyout x:Name="SideBarItemContextFlyout">
+                                                    <MenuFlyout.Items>
+                                                        <MenuFlyoutItem x:Name="UnpinItem" Text="Unpin from Sidebar"/>
+                                                    </MenuFlyout.Items>
+                                                </MenuFlyout>
+                                            </ResourceDictionary>
+                                        </ResourceDictionary.MergedDictionaries>
+                                    </ResourceDictionary>
                                 </ListView.Resources>
-                                <ListViewItem Tag="Home">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xE737;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Home" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="Desktop">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xE8FC;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Desktop" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="Downloads">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xE896;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Downloads" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="Documents">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xE8A5;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Documents" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="Pictures">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xEB9F;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Pictures" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="Music">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xEC4F;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Music" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="Videos">
-                                    <ListViewItem.Content>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate>
                                         <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xE8B2;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Videos" FontSize="12"/>
+                                            <FontIcon FontSize="16" Glyph="{Binding IconGlyph}" FontFamily="Segoe MDL2 Assets"/>
+                                            <TextBlock Text="{Binding Text}" FontSize="12"/>
                                         </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
                             </ListView>
-                            <TextBlock Margin="10" Text="Drives" FontSize="14" FontWeight="Bold" Padding="0" VerticalAlignment="Stretch"/>
-                            <ListView SelectionChanged="DrivesList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="DrivesList_ItemClick" Name="DrivesList">
+                            <TextBlock Margin="10,10,10,5" Text="Drives" FontSize="14" FontWeight="Bold" Padding="0" VerticalAlignment="Stretch"/>
+                            <ListView AllowDrop="True" CanReorderItems="True" ItemsSource="{x:Bind local:App.foundDrives}" SelectionChanged="DrivesList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="DrivesList_ItemClick" Name="DrivesList">
                                 <ListView.Resources>
                                     <ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
                                 </ListView.Resources>
-                                <ListViewItem Tag="LocalDisk">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xEDA2;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="Local Disk (C:\)" FontSize="12"/>
-                                        </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
-                                <ListViewItem Tag="OneDrive">
-                                    <ListViewItem.Content>
-                                        <StackPanel Spacing="15" Orientation="Horizontal">
-                                            <FontIcon FontSize="16" Glyph="&#xE753;" FontFamily="Segoe MDL2 Assets"/>
-                                            <TextBlock Text="OneDrive" FontSize="12"/>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel ToolTipService.ToolTip="{Binding spaceText}" Spacing="15" Orientation="Horizontal">
+                                            <Grid>
+                                                <FontIcon Visibility="{Binding driveGlyphVisibility}" FontSize="16" Glyph="{Binding glyph}" FontFamily="Segoe MDL2 Assets"/>
+                                                <FontIcon Visibility="{Binding cloudGlyphVisibility}" FontSize="16" Glyph="&#xE753;" FontFamily="Segoe MDL2 Assets"/>
+                                            </Grid>
+                                            <TextBlock Text="{Binding driveText}" FontSize="12"/>
                                         </StackPanel>
-                                    </ListViewItem.Content>
-                                </ListViewItem>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
                             </ListView>
                         </StackPanel>
                     </Grid>
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
index d65a39e2a39d..24f7ea5be62c 100644
--- a/Files UWP/ProHome.xaml.cs	
+++ b/Files UWP/ProHome.xaml.cs	
@@ -16,6 +16,7 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Animation;
 using Windows.UI.Xaml.Navigation;
@@ -97,12 +98,12 @@ public ProHome()
             accessiblePathListView = PathViewInteract;
             accessiblePathListView.ItemsSource = pathBoxItems;
             ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
-            PopulatePinnedSidebarItems();
-            PopulateNavViewWithExternalDrives();
+            //PopulateNavViewWithExternalDrives();
             BackButton.Click += NavigationActions.Back_Click;
             ForwardButton.Click += NavigationActions.Forward_Click;
             RefreshButton.Click += NavigationActions.Refresh_Click;
             UpButton.Click += NavigationActions.Up_Click;
+            UnpinItem.Click += App.FlyoutItem_Click;
 
             // Overwrite paths for common locations if Custom Locations setting is enabled
             if(localSettings.Values["customLocationsSetting"] != null)
@@ -123,206 +124,6 @@ public ProHome()
             deleteProgressBoxTextInfo = deleteInfoCurrentText;
         }
 
-        List<string> LinesToRemoveFromFile = new List<string>();
-
-        public async void PopulatePinnedSidebarItems()
-        {
-            StorageFile ListFile;
-            StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;
-            try
-            {
-                ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
-            }
-            catch(FileNotFoundException)
-            {
-                ListFile = await cacheFolder.CreateFileAsync("PinnedItems.txt");
-            }
-            
-            if(ListFile != null)
-            {
-                var ListFileLines = await FileIO.ReadLinesAsync(ListFile);
-                foreach (string s in ListFileLines)
-                {
-                    try
-                    {
-                        StorageFolder fol = await StorageFolder.GetFolderFromPathAsync(s);
-                        var name = fol.DisplayName;
-                        var content = name;
-                        var icon = "\uE8B7";
-
-                        FontFamily fontFamily = new FontFamily("Segoe MDL2 Assets");
-                        FontIcon fontIcon = new FontIcon()
-                        {
-                            FontSize = 16,
-                            FontFamily = fontFamily,
-                            Glyph = icon
-                        };
-
-                        TextBlock text = new TextBlock()
-                        {
-                            Text = content,
-                            FontSize = 12
-                        };
-
-                        StackPanel stackPanel = new StackPanel()
-                        {
-                            Spacing = 15,
-                            Orientation = Orientation.Horizontal
-                        };
-
-                        stackPanel.Children.Add(fontIcon);
-                        stackPanel.Children.Add(text);
-                        MenuFlyout flyout = new MenuFlyout();
-                        MenuFlyoutItem flyoutItem = new MenuFlyoutItem()
-                        {
-                            Text = "Unpin item"
-                        };
-                        flyoutItem.Click += FlyoutItem_Click;
-                        flyout.Items.Add(flyoutItem);
-                        bool isDuplicate = false;
-                        foreach (ListViewItem lvi in LocationsList.Items)
-                        {
-                            if (lvi.Tag.ToString() == s)
-                            {
-                                isDuplicate = true;
-
-                            }
-                        }
-
-                        if (!isDuplicate)
-                        {
-                            ListViewItem newItem = new ListViewItem();
-                            newItem.Content = stackPanel;
-                            newItem.Tag = s;
-                            newItem.ContextFlyout = flyout;
-                            newItem.IsRightTapEnabled = true;
-                            newItem.RightTapped += NewItem_RightTapped;
-                            LocationsList.Items.Add(newItem);
-                        }
-                    }
-                    catch (UnauthorizedAccessException e)
-                    {
-                        Debug.WriteLine(e.Message);
-                    }
-                    catch (FileNotFoundException e)
-                    {
-                        Debug.WriteLine("Pinned item was deleted and will be removed from the file lines list soon: " + e.Message);
-                        LinesToRemoveFromFile.Add(s);
-                    }
-                    catch (System.Runtime.InteropServices.COMException e)
-                    {
-                        Debug.WriteLine("Pinned item's drive was ejected and will be removed from the file lines list soon: " + e.Message);
-                        LinesToRemoveFromFile.Add(s);
-                    }
-                }
-
-                foreach (string path in LinesToRemoveFromFile)
-                {
-                    ListFileLines.Remove(path);
-                }
-
-                await FileIO.WriteLinesAsync(ListFile, ListFileLines);
-                ListFileLines = await FileIO.ReadLinesAsync(ListFile);
-
-                // Remove unpinned items from sidebar
-                foreach (ListViewItem location in LocationsList.Items)
-                {
-                    if (!(location.Tag.ToString() == "Home" || location.Tag.ToString() == "Desktop" || location.Tag.ToString() == "Documents" || location.Tag.ToString() == "Downloads" || location.Tag.ToString() == "Pictures" || location.Tag.ToString() == "Music" || location.Tag.ToString() == "Videos"))
-                    {
-
-                        if (!ListFileLines.Contains(location.Tag.ToString()))
-                        {
-                            if(LocationsList.SelectedItem == location)
-                            {
-                                LocationsList.SelectedIndex = 0;
-                                accessibleContentFrame.Navigate(typeof(YourHome), "New tab");
-                                PathText.Text = "New tab";
-                                LayoutItems.isEnabled = false;
-                            }
-                            LocationsList.Items.Remove(location);
-                        }
-                    }
-                }
-                LinesToRemoveFromFile.Clear();
-            }
-        }
-
-        ListViewItem rightClickedItem;
-
-        private void NewItem_RightTapped(object sender, RightTappedRoutedEventArgs e)
-        {
-            rightClickedItem = sender as ListViewItem;
-        }
-
-        public void PopulateNavViewWithExternalDrives()
-        {
-            DrivesList.Items.Clear();
-            foreach(var drive in App.foundDrives)
-            {
-                FontFamily fontFamily = new FontFamily("Segoe MDL2 Assets");
-                FontIcon fontIcon = new FontIcon()
-                {
-                    FontSize = 16,
-                    FontFamily = fontFamily,
-                    Glyph = drive.glyph
-                };
-
-                TextBlock text = new TextBlock()
-                {
-                    Text = drive.driveText,
-                    FontSize = 12
-                };
-
-                StackPanel stackPanel = new StackPanel()
-                {
-                    Spacing = 15,
-                    Orientation = Orientation.Horizontal
-                };
-
-                stackPanel.Children.Add(fontIcon);
-                stackPanel.Children.Add(text);
-                DrivesList.Items.Add(new ListViewItem()
-                {
-                    Content = stackPanel,
-                    Tag = drive.tag
-                });
-            }
-
-            ListViewItem oneDriveItem = new ListViewItem();
-            oneDriveItem.Tag = "OneDrive";
-            StackPanel sp = new StackPanel()
-            {
-                Spacing = 15,
-                Orientation = Orientation.Horizontal
-
-            };
-            FontIcon fi = new FontIcon();
-            fi.Glyph = "\uE753";
-            fi.FontSize = 16;
-            sp.Children.Add(fi);
-            TextBlock textBlock = new TextBlock();
-            textBlock.FontSize = 12;
-            textBlock.Text = "OneDrive";
-            sp.Children.Add(textBlock);
-            oneDriveItem.Content = sp;
-            DrivesList.Items.Add(oneDriveItem);
-        }
-
-        private async void FlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            StorageFolder cacheFolder = Windows.Storage.ApplicationData.Current.LocalCacheFolder;
-            var ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
-            var ListFileLines = await FileIO.ReadLinesAsync(ListFile);
-            foreach (string s in ListFileLines)
-            {
-                if(s == rightClickedItem.Tag.ToString())
-                {
-                    LinesToRemoveFromFile.Add(s);
-                    PopulatePinnedSidebarItems();
-                    return;
-                }
-            }
-        }
 
         private void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)
         {
@@ -528,103 +329,106 @@ public async void CheckPathInput(ItemViewModel instance, string CurrentInput)
 
         private void LocationsList_ItemClick(object sender, ItemClickEventArgs e)
         {
-            ListViewItem clickedItem = Interaction.FindParent<ListViewItem>(e.ClickedItem as DependencyObject);
+            SidebarItem clickedItem = e.ClickedItem as SidebarItem;
 
-            if (clickedItem.Tag.ToString() == "Home")
+            if (clickedItem.isDefaultLocation)
             {
-                ItemDisplayFrame.Navigate(typeof(YourHome), "New tab");
-                PathText.Text = "New tab";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                if (clickedItem.Text.ToString() == "Home")
                 {
-                    DrivesList.SelectedItem = null;
+                    ItemDisplayFrame.Navigate(typeof(YourHome), "New tab");
+                    PathText.Text = "New tab";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
                     LayoutItems.isEnabled = false;
                 }
-                LayoutItems.isEnabled = false;
-            }
-            else if (clickedItem.Tag.ToString() == "Desktop")
-            {
-                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), DesktopPath);
-                PathText.Text = "Desktop";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                else if (clickedItem.Text.ToString() == "Desktop")
                 {
-                    DrivesList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
+                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), DesktopPath);
+                    PathText.Text = "Desktop";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
+                    LayoutItems.isEnabled = true;
                 }
-                LayoutItems.isEnabled = true;
-            }
-            else if (clickedItem.Tag.ToString() == "Downloads")
-            {
-                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);
-                PathText.Text = "Downloads";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                else if (clickedItem.Text.ToString() == "Downloads")
                 {
-                    DrivesList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
+                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), DownloadsPath);
+                    PathText.Text = "Downloads";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
+                    LayoutItems.isEnabled = true;
                 }
-                LayoutItems.isEnabled = true;
-            }
-            else if (clickedItem.Tag.ToString() == "Documents")
-            {
-                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);
-                PathText.Text = "Documents";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                else if (clickedItem.Text.ToString() == "Documents")
                 {
-                    DrivesList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
+                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), DocumentsPath);
+                    PathText.Text = "Documents";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
+                    LayoutItems.isEnabled = true;
                 }
-                LayoutItems.isEnabled = true;
-            }
-            else if (clickedItem.Tag.ToString() == "Pictures")
-            {
-                ItemDisplayFrame.Navigate(typeof(PhotoAlbum), PicturesPath);
-                PathText.Text = "Pictures";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                else if (clickedItem.Text.ToString() == "Pictures")
                 {
-                    DrivesList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
+                    ItemDisplayFrame.Navigate(typeof(PhotoAlbum), PicturesPath);
+                    PathText.Text = "Pictures";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
+                    LayoutItems.isEnabled = true;
                 }
-                LayoutItems.isEnabled = true;
-            }
-            else if (clickedItem.Tag.ToString() == "Music")
-            {
-                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), MusicPath);
-                PathText.Text = "Music";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                else if (clickedItem.Text.ToString() == "Music")
                 {
-                    DrivesList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
+                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), MusicPath);
+                    PathText.Text = "Music";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
+                    LayoutItems.isEnabled = true;
                 }
-                LayoutItems.isEnabled = true;
-            }
-            else if (clickedItem.Tag.ToString() == "Videos")
-            {
-                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
-                PathText.Text = "Videos";
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (DrivesList.SelectedItem != null)
+                else if (clickedItem.Text.ToString() == "Videos")
                 {
-                    DrivesList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
+                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
+                    PathText.Text = "Videos";
+                    HomeItems.isEnabled = false;
+                    ShareItems.isEnabled = false;
+                    if (DrivesList.SelectedItem != null)
+                    {
+                        DrivesList.SelectedItem = null;
+                        LayoutItems.isEnabled = false;
+                    }
+                    LayoutItems.isEnabled = true;
                 }
-                LayoutItems.isEnabled = true;
             }
             else
             {
-                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), clickedItem.Tag);
-                PathText.Text = clickedItem.Tag.ToString();
+                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), clickedItem.Path);
+                PathText.Text = clickedItem.Text;
                 HomeItems.isEnabled = false;
                 ShareItems.isEnabled = false;
                 if (DrivesList.SelectedItem != null)
@@ -639,102 +443,34 @@ private void LocationsList_ItemClick(object sender, ItemClickEventArgs e)
 
         private void DrivesList_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (this.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
+            HomeItems.isEnabled = false;
+            ShareItems.isEnabled = false;
+            if (LocationsList.SelectedItem != null)
             {
-                var instance = instanceViewModel;
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (LocationsList.SelectedItem != null)
-                {
-                    LocationsList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
-                }
-
-                ListViewItem clickedItem = Interaction.FindParent<ListViewItem>(e.ClickedItem as DependencyObject);
-
-                if (clickedItem.Tag.ToString() == "LocalDisk")
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), @"C:\");
-                    PathText.Text = @"Local Disk (C:\)";
-                    LayoutItems.isEnabled = true;
-                }
-                else if (clickedItem.Tag.ToString() == "OneDrive")
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), OneDrivePath);
-                    PathText.Text = "OneDrive";
-                    LayoutItems.isEnabled = true;
-                }
-                else
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), clickedItem.Tag.ToString());
-                    PathText.Text = clickedItem.Tag.ToString();
-                    LayoutItems.isEnabled = true;
-                }
+                LocationsList.SelectedItem = null;
+                LayoutItems.isEnabled = false;
             }
-            else if (this.accessibleContentFrame.SourcePageType == typeof(YourHome))
-            {
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (LocationsList.SelectedItem != null)
-                {
-                    LocationsList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
-                }
 
-                ListViewItem clickedItem = Interaction.FindParent<ListViewItem>(e.ClickedItem as DependencyObject);
+            DriveItem clickedItem = e.ClickedItem as DriveItem;
 
-                if (clickedItem.Tag.ToString() == "LocalDisk")
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), @"C:\");
-                    PathText.Text = @"Local Disk (C:\)";
-                    LayoutItems.isEnabled = true;
-                }
-                else if (clickedItem.Tag.ToString() == "OneDrive")
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), OneDrivePath);
-                    PathText.Text = "OneDrive";
-                    LayoutItems.isEnabled = true;
-                }
-                else
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), clickedItem.Tag.ToString());
-                    PathText.Text = clickedItem.Tag.ToString();
-                    LayoutItems.isEnabled = true;
-                }
+            if (clickedItem.tag.ToString() == "LocalDisk")
+            {
+                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), @"C:\");
+                PathText.Text = @"Local Disk (C:\)";
+                LayoutItems.isEnabled = true;
             }
-            else if (this.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
+            else if (clickedItem.tag.ToString() == "OneDrive")
             {
-                var instance = instanceViewModel;
-                HomeItems.isEnabled = false;
-                ShareItems.isEnabled = false;
-                if (LocationsList.SelectedItem != null)
-                {
-                    LocationsList.SelectedItem = null;
-                    LayoutItems.isEnabled = false;
-                }
-
-                ListViewItem clickedItem = Interaction.FindParent<ListViewItem>(e.ClickedItem as DependencyObject);
-
-                if (clickedItem.Tag.ToString() == "LocalDisk")
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), @"C:\");
-                    PathText.Text = @"Local Disk (C:\)";
-                    LayoutItems.isEnabled = true;
-                }
-                else if (clickedItem.Tag.ToString() == "OneDrive")
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), OneDrivePath);
-                    PathText.Text = "OneDrive";
-                    LayoutItems.isEnabled = true;
-                }
-                else
-                {
-                    ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), clickedItem.Tag.ToString());
-                    PathText.Text = clickedItem.Tag.ToString();
-                    LayoutItems.isEnabled = true;
-                }
+                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), OneDrivePath);
+                PathText.Text = "OneDrive";
+                LayoutItems.isEnabled = true;
             }
-                
+            else
+            {
+                ItemDisplayFrame.Navigate(typeof(GenericFileBrowser), clickedItem.tag.ToString());
+                PathText.Text = clickedItem.tag.ToString();
+                LayoutItems.isEnabled = true;
+            }  
         }
 
         string NavParams = null;
@@ -1065,6 +801,17 @@ private void ManualPathEntryItem_Click(object sender, RoutedEventArgs e)
             VisiblePath.Focus(FocusState.Programmatic);
             VisiblePath.SelectionStart = VisiblePath.Text.Length;
         }
+
+        private void LocationsList_RightTapped(object sender, RightTappedRoutedEventArgs e)
+        {
+            ListView list = (ListView)sender;
+            var item = ((FrameworkElement)e.OriginalSource).DataContext as SidebarItem;
+            if (!item.isDefaultLocation)
+            {
+                SideBarItemContextFlyout.ShowAt(list, e.GetPosition(list));
+                App.rightClickedItem = item;
+            }
+        }
     }
 
     public class NavigationActions
@@ -1131,20 +878,20 @@ public static void Back_Click(object sender, RoutedEventArgs e)
                         }
                         else if (Parameter.ToString() == ProHome.OneDrivePath)
                         {
-                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "OneDrive").First();
                             CurrentTabInstance.PathText.Text = "OneDrive";
                         }
                         else
                         {
                             if (Parameter.ToString().Contains("C:\\") || Parameter.ToString().Contains("c:\\"))
                             {
-                                CurrentTabInstance.drivesList.SelectedIndex = 0;
+                                CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                                foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                                 {
-                                    if (drive.Tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
+                                    if (drive.tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
                                     {
                                         CurrentTabInstance.drivesList.SelectedItem = drive;
                                         break;
@@ -1207,20 +954,20 @@ public static void Back_Click(object sender, RoutedEventArgs e)
                         }
                         else if (Parameter.ToString() == ProHome.OneDrivePath)
                         {
-                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                             CurrentTabInstance.PathText.Text = "OneDrive";
                         }
                         else
                         {
                             if (Parameter.ToString().Contains("C:\\") || Parameter.ToString().Contains("c:\\"))
                             {
-                                CurrentTabInstance.drivesList.SelectedIndex = 0;
+                                CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                                foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                                 {
-                                    if (drive.Tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
+                                    if (drive.tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
                                     {
                                         CurrentTabInstance.drivesList.SelectedItem = drive;
                                         break;
@@ -1283,20 +1030,20 @@ public static void Back_Click(object sender, RoutedEventArgs e)
                         }
                         else if (Parameter.ToString() == ProHome.OneDrivePath)
                         {
-                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                             CurrentTabInstance.PathText.Text = "OneDrive";
                         }
                         else
                         {
                             if (Parameter.ToString().Contains("C:\\") || Parameter.ToString().Contains("c:\\"))
                             {
-                                CurrentTabInstance.drivesList.SelectedIndex = 0;
+                                CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                                foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                                 {
-                                    if (drive.Tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
+                                    if (drive.tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
                                     {
                                         CurrentTabInstance.drivesList.SelectedItem = drive;
                                         break;
@@ -1368,20 +1115,20 @@ public static void Forward_Click(object sender, RoutedEventArgs e)
                         }
                         else if (Parameter.ToString() == ProHome.OneDrivePath)
                         {
-                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                             CurrentTabInstance.PathText.Text = "OneDrive";
                         }
                         else
                         {
                             if (Parameter.ToString().Contains("C:\\") || Parameter.ToString().Contains("c:\\"))
                             {
-                                CurrentTabInstance.drivesList.SelectedIndex = 0;
+                                CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                                foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                                 {
-                                    if (drive.Tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
+                                    if (drive.tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
                                     {
                                         CurrentTabInstance.drivesList.SelectedItem = drive;
                                         break;
@@ -1446,20 +1193,20 @@ public static void Forward_Click(object sender, RoutedEventArgs e)
                         }
                         else if (Parameter.ToString() == ProHome.OneDrivePath)
                         {
-                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                             CurrentTabInstance.PathText.Text = "OneDrive";
                         }
                         else
                         {
                             if (Parameter.ToString().Contains("C:\\") || Parameter.ToString().Contains("c:\\"))
                             {
-                                CurrentTabInstance.drivesList.SelectedIndex = 0;
+                                CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                                foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                                 {
-                                    if (drive.Tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
+                                    if (drive.tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
                                     {
                                         CurrentTabInstance.drivesList.SelectedItem = drive;
                                         break;
@@ -1523,20 +1270,20 @@ public static void Forward_Click(object sender, RoutedEventArgs e)
                         }
                         else if (Parameter.ToString() == ProHome.OneDrivePath)
                         {
-                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                            CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                             CurrentTabInstance.PathText.Text = "OneDrive";
                         }
                         else
                         {
                             if (Parameter.ToString().Contains("C:\\") || Parameter.ToString().Contains("c:\\"))
                             {
-                                CurrentTabInstance.drivesList.SelectedIndex = 0;
+                                CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                             }
                             else
                             {
-                                foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                                foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                                 {
-                                    if (drive.Tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
+                                    if (drive.tag.ToString().Contains(Parameter.ToString().Split("\\")[0]))
                                     {
                                         CurrentTabInstance.drivesList.SelectedItem = drive;
                                         break;
@@ -1606,20 +1353,20 @@ public static void Up_Click(object sender, RoutedEventArgs e)
                 }
                 else if (parentDirectoryOfPath == ProHome.OneDrivePath)
                 {
-                    CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                    CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                     CurrentTabInstance.PathText.Text = "OneDrive";
                 }
                 else
                 {
                     if (parentDirectoryOfPath.Contains("C:\\") || parentDirectoryOfPath.Contains("c:\\"))
                     {
-                        CurrentTabInstance.drivesList.SelectedIndex = 0;
+                        CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                     }
                     else
                     {
-                        foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                        foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                         {
-                            if (drive.Tag.ToString().Contains(parentDirectoryOfPath.Split("\\")[0]))
+                            if (drive.tag.ToString().Contains(parentDirectoryOfPath.Split("\\")[0]))
                             {
                                 CurrentTabInstance.drivesList.SelectedItem = drive;
                                 break;
@@ -1682,20 +1429,20 @@ public static void Up_Click(object sender, RoutedEventArgs e)
                 }
                 else if (parentDirectoryOfPath == ProHome.OneDrivePath)
                 {
-                    CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as ListViewItem).Tag.ToString() == "OneDrive").First();
+                    CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag.ToString() == "OneDrive").First();
                     CurrentTabInstance.PathText.Text = "OneDrive";
                 }
                 else
                 {
                     if (parentDirectoryOfPath.Contains("C:\\") || parentDirectoryOfPath.Contains("c:\\"))
                     {
-                        CurrentTabInstance.drivesList.SelectedIndex = 0;
+                        CurrentTabInstance.drivesList.SelectedItem = CurrentTabInstance.drivesList.Items.Where(x => (x as DriveItem).tag == "C:\\").First();
                     }
                     else
                     {
-                        foreach (ListViewItem drive in CurrentTabInstance.drivesList.Items)
+                        foreach (DriveItem drive in CurrentTabInstance.drivesList.Items)
                         {
-                            if (drive.Tag.ToString().Contains(parentDirectoryOfPath.Split("\\")[0]))
+                            if (drive.tag.ToString().Contains(parentDirectoryOfPath.Split("\\")[0]))
                             {
                                 CurrentTabInstance.drivesList.SelectedItem = drive;
                                 break;
diff --git a/Files UWP/SettingsPages/About.xaml b/Files UWP/SettingsPages/About.xaml
index 34130facdf64..4db10f68c967 100644
--- a/Files UWP/SettingsPages/About.xaml	
+++ b/Files UWP/SettingsPages/About.xaml	
@@ -1,4 +1,4 @@
-<Page
+<Page xmlns:my="using:Microsoft.Toolkit.Uwp.UI.Controls" 
     x:Class="Files.SettingsPages.About"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,27 +8,43 @@
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Grid Padding="24,24,0,0">
-       
-        <ScrollViewer>
-            <StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <TextBlock x:Name="Header" Text="Files UWP" Margin="0,0,0,5" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
-                <TextBlock Margin="0,0,0,5" FontFamily="Segoe UI" FontSize="20" Text="Product Information"/>
-                <TextBlock FontSize="14" Text="Edition: Pre-Release"/>
-                <TextBlock FontSize="14" x:Name="VersionNumber" Text="Version: 0.5.0"/>
-                <ListView  IsItemClickEnabled="True" Margin="0,24,0,0" ItemClick="ListView_ItemClick" HorizontalAlignment="Left" Width="875">
-                    <ListViewItem IsEnabled="True" Name="FeedbackForm" Height="65" HorizontalAlignment="Stretch">
-                        <StackPanel  Orientation="Horizontal">
-                            <FontIcon Margin="0,0,25,0" Glyph="&#xED15;"/>
-                            <StackPanel Orientation="Vertical">
-                                <TextBlock Text="Submit Feedback"/>
-                                <TextBlock Text="Submit an issue report to provide the developers with information" Foreground="Gray"/>
-                            </StackPanel>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Spacing="24" Padding="24,14" Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <Grid Height="150" Width="150">
+                <my:DropShadowPanel OffsetY="15">
+                    <Image Stretch="Uniform" Source="/Assets/Files UWP Icon.png"/>
+                </my:DropShadowPanel>
+            </Grid>
+
+                <StackPanel Margin="0,0" Orientation="Vertical" VerticalAlignment="Center">
+                    <TextBlock x:Name="Header" Text="Files UWP" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <TextBlock Margin="0,0,0,5" FontFamily="Segoe UI" FontSize="20" Text="Product Information"/>
+                    <TextBlock FontSize="14" Text="Edition: Pre-Release"/>
+                    <TextBlock FontSize="14" x:Name="VersionNumber" Text="Version: 0.5.0"/>
+                </StackPanel>
+
+        </StackPanel>
+
+
+        <Grid Padding="14" Grid.Row="1" >
+            <TextBlock Text="The community thanks contributors: SOI7, jeffsieu, and yaichenbaum for the design of our wonderful icon."/>
+            <ListView IsItemClickEnabled="True" Margin="0,24,0,0" ItemClick="ListView_ItemClick" HorizontalAlignment="Left" Width="875">
+                <ListViewItem IsEnabled="True" Name="FeedbackForm" Height="65" HorizontalAlignment="Stretch">
+                    <StackPanel  Orientation="Horizontal">
+                        <FontIcon Margin="0,0,25,0" Glyph="&#xED15;"/>
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock Text="Submit Feedback"/>
+                            <TextBlock Text="Submit an issue report to provide the developers with information" Foreground="Gray"/>
                         </StackPanel>
+                    </StackPanel>
+
+                </ListViewItem>
+            </ListView>
+        </Grid>
 
-                    </ListViewItem>
-                </ListView>
-            </StackPanel>
-        </ScrollViewer>
     </Grid>
 </Page>
diff --git a/FilesUwp.Package/Package.appxmanifest b/FilesUwp.Package/Package.appxmanifest
index 72127a6995ac..7fc3511e69aa 100644
--- a/FilesUwp.Package/Package.appxmanifest
+++ b/FilesUwp.Package/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap mp rescap desktop4 desktop">
-  <Identity Name="49306atecsolution.FilesUWP" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.6.4.0" />
+  <Identity Name="49306atecsolution.FilesUWP" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.6.5.0" />
   <Properties>
     <DisplayName>Files UWP</DisplayName>
     <PublisherDisplayName>Yair A</PublisherDisplayName>
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$" desktop4:SupportsMultipleInstances="true">
-      <uap:VisualElements DisplayName="Files UWP" Description="Meet Files, a free and open-source File Manager for Windows 10. Created from the ground up to look and feel amazing, Files is built to replace the dated Windows File Explorer." Square150x150Logo="Assets\Square150x150Logo.png"  Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="Files UWP" Description="Meet Files, a free and open-source File Manager for Windows 10. Created from the ground up to look and feel amazing, Files is built to replace the dated Windows File Explorer." Square150x150Logo="Assets\Square150x150Logo.png"  Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="#191919">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png" ShortName="Files UWP">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo"/>
@@ -23,7 +23,7 @@
             <uap:ShowOn Tile="square310x310Logo"/>
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" uap5:Optional="true"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" uap5:Optional="true" BackgroundColor="#191919"/>
       </uap:VisualElements>
       <Extensions>
         <desktop:Extension Category="windows.fullTrustProcess" Executable="ProcessLauncher\ProcessLauncher.exe" />
diff --git a/ProcessLauncher/Program.cs b/ProcessLauncher/Program.cs
index 21818e8e2733..3d96fd8e8e35 100644
--- a/ProcessLauncher/Program.cs
+++ b/ProcessLauncher/Program.cs
@@ -17,7 +17,7 @@ static void Main(string[] args)
             Process process = new Process();
             process.StartInfo.UseShellExecute = false;
             process.StartInfo.FileName = executable;
-            if(arguments != "")
+            if(!string.IsNullOrWhiteSpace(arguments))
             {
                 process.StartInfo.CreateNoWindow = false;
                 process.StartInfo.Arguments = arguments;