- Refactored to diffrent form creation
- Form are created via factory