Fix overlapping buttons
Merge branch 'master' of github.com:alaurenz/metrobike