Post-final

Fixed map drag and zoom