cleaning up UI for submission