Improved upload controls