updated models, forms for view