#1592: Turn Upload file form into 2 buttons: Upload and Cancel.