Small form design fixes
Refactor entities
Refactor Services
Refactor Views
Refactor Forms
Refactor Controllers
Merge branch 'feature/configservice' into develop
Merge branch 'feature/formdesign' into develop