Improve the Submit page with the rows and add choose delivery notice page