Fixed bug where image creation caused issues with a section.
Changed modify choice layout to not suck.