Remove fix_thumbnail_margins
Reformat forms to use new wrappers