Adding improvements to mobile version