Fix style issues

Also fix typo on on MediaFileUpload.