Map and Mice sections - few caliburn mapping updates