Change map fill to 100%
Merge branch 'dev'
merge with full screening map