Added popover and tooltips