More work on notification/display handling