Refactoring
Replaced all alerts by popup notifications