Refactored form building, added first draft of finance planner form.