container fixes in map, and zoom issue fixes part 1