move things about, replace popover with tooltip