Address #377: redefine the steps using navigation