Slight fixes. Removed popover.