Fixes #751 - keep the headers on the map screen if large enough
Merge branch 'issues/751-map-display-changes'