Save / Upload Form working after loads of fixes