refactored views added notifications
refactoring