try to make things a bit more readable (form was small previously)