Improved upload form again.