Improve upload pages