some fixes and refactor of the mobile layout