#548 added wrapper div around image upload field