Chore/change form to simpleform