Moved model processing to dedicated model class
Moved info icon to right of field name