3.2b5 template fixes

There are several pages in beta5 where the template is messed up – usually misplaced closing tags that cause the form buttons to kick outside of the appropriate wrapper. I see the behavior in Joomla, but not in Drupal (sandbox site). So I think the Drupal theme must be doing something that helps reduce the problems. But regardless, the malformed html should be affecting both.

Attached are patches.