Re-work the layout of the Submission.