changed the models again, worked on views urls and templates