Add create navigation pop button and finish for submission