Bug fix. Refactoring show notifications.