Refactor dish form so it's more manageable now