Merge branch 'hotfix/maps_fix'
Merge branch 'develop'
Merge branch 'develop'
changed menu header to be on one line