Changed popover behavior
major cleanup