Tag cycle in templates will change in 1.8. Prepare now.
Removed unused model form FirmForm.
Model form WorkForm adden fields according to future 1.8.