ticket:6 fixed forms, optimized template
Merge branch 'ticket_6'