Refactored form helper
Fixed calls to Mustache