Added auto iPad extents to top left map displays
fixed merge conflicts