Expand the aspects of habits

* add fields to the form for new habit
* move logic to helper method