added mobile version
resolved merge conflicts