Improved user experience in the Windows App