[ModernApp] Favourites and UI Cleanup