Merge fixed form and image changes

attempt to merge via github