Improve the form UI