Improve Category and Hostgroup form