Bringing the upload page up to spec