major improvements in controllers, views, models