Hide upload iframe and fix merge flaws