models, views and forms modified