added simpleform, updated models, views