Fixes button size and alignment issues with metadata and upload forms, r...

...efs #9569