Profile edit / create template - layout is broken when multiple checkbox fields included

Layout is seriously messed up with certain combination of custom field checkboxes which have 'Options per line' param set. Peter D recreated on 3.2 demo at:
http://drupal.demo.civicrm.org/civicrm/profile/create?gid=12&reset=1

Notice how the last 2 fields are mis-formatted.

I've attached some screenshots - including one which shows the firebug inspect - I see that the <form tag is closed too early and there are 2 crm-container id div's and a <div class="form-layout-compressed"> that i'm not sure is closed.

Also - this code in Dynamic.tpl seems weird. If we only want to have buttons on top for $isDuplicate - then we should surround the <div> - else we get wasted white space.
<div class="crm-submit-buttons">

{if $isDuplicate}

<span class="crm-button">{$form._qf_Edit_upload_duplicate.html}</span>

{/if}

</div>

Related forum post at:
http://forum.civicrm.org/index.php/topic,14624.msg62389.html#msg62389