Merge branch 'refs/heads/master' into develop
adjust CSS for map and upcoming views,
add CSS to move cost button to better position
fix spacing
Merge branch 'refs/heads/develop'