changed models, setting up views and templates