fixed models and added modelform