Added popover and click behaviour