fix buttons, map fills screen
Merge branch 'master' into feature/map_fix
map fills screen, bugs fixed
MErged with the map updates
Map is working