Improving the submission form a bit.