Modify form to display data in edit screen
Add tests, edit set functionality