Fixed problems with Maps
Fixed maps and tab views