Refactor form creation
Refactor form creation
Fixed warning with non existing config entries