UI and notification fix