new migration and some view changes