Improve the input forms