Upload page fixes