Better handling of controls form