View and some business logic changes