Map tweaks
Merge branch 'master' of https://github.com/thijsh/HLP-
Layout changes