Improvements on popover implementation.