Little fixes on modelform