Improved flow and changed nav titles and buttons