several form improvements

Improving a form, only makes it tastier