Better upload management and error display in form