fix upload button layout
remove extra upload controls
modify js to move upload wrapper, modify css to match core values
change em to px
change publicUploadButtonMock to public_upload

Changed jQuery selector for public preview to public_upload to correctly show preview
Merge pull request #6719 from tripflex/fix_pubup_progbar

Fix public upload progress bar