Improved mobile support + small fixes