Added better mobile support