Moved navbar to optional step