Fixed map margin-top issue, continued to work on testing