A shipment of margin adjustments

Mostly margin adjustments, and some style improvement on the file upload form.