SPA: Fix mobile issues