Refactor a lot
Use new string formatting
Fix spacing of classes
Nest creation of the widget for the fields