Adding popover and some tricks