Fixed map layout errors
Merge branch 'development' into dave
Errors fixed, kind of