Consolidate upload form + add finalize button