Add simple form.  Refactor code. Add new form style