More small fixes to the UI and the notification handling.