fixed map bugs and updated layout