Migrations added and few UI changes