Includes a finish step and some updates to navigation