Add form fields base
Cleanups, forms, cruds
Update form