various image upload and alignment fixes