Updated for DesktopWeb and AndroidTab SPA