Fixed 2 columns layout in forms

Done mainly by:
- removed a few class 'span6',
- rearranged html structure.