Cleaned up migrations and altered views