improved tracking of user input data, added edit nav bauttons on final screen, overall cleanup