Improved form: site and resource types can now be selecto via menu