Fixed GUI Notifications and handlers