Submission view and fixes