Popover and Gestures: Some work that fixes the initial version.