Wrap some content in divs for easier styling

These changes were required to get some styles working in method, particularly with horizontal vs. vertical radios/checkboxes.