Added search template
Use standard elements
Improved form elements