Fixed upload form (which looked ugly in my theme)
Merge branch 'no-smart-reader' into everything
Merge branch 'fixed-upload-form' into everything