Refactored view order and pay bill control flow.