Better sanitization of upload option.  Minor style tweaks.