Fix Notification Switches and Worker Add Button