Enhance image uploader
Merge heads