Popovers refactor.