Fix overlap between map controls and label (fixes #883)