Lots of bugs and fixes inclding Maps, setting and Shopping pages