Refactoring layouts and improving design.
Merge branch 'master' of https://github.com/ArriveApp/arrive-server