Migrations updated, views and other changes