Improved form; made custom display work