Reorganize internals and unify step popover