Enhancing forms
Fixing component insert