ticket:5 Template and form fields issues solved