Small Notifications UI changes and fixups