popover, modal changes. Few minor fixes.