Clean up display of image field on comment form

Problem/Motivation

When an image field is added to a custom comment type, Save and Preview button float next to the image field, and the image help text spacing is a bit off.

Bartik (incorrect):

Seven (correct):

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes