Improve design of component form