some fields can now have a formula as input
added hourly_rate and amount to template model/forms