Improved UI on mobile and fixed a bug on the return stop selection