some minor tweaks in map layout (see #1163 #1168)