Some fixes on desktop, started mobile up