some form fixes

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
comments #7 - income model and simple form

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'income' into develop