Fixing up the default values
UI changes to enable changing the notification