Little improvements in forms - with @diegoeis