updated for SPA iPad and android tab