Tweak popover and add toggle switch