Remove steps from submit form, improve layout of submit page