Updated tooltip/popover to include 'container' param