Added notification-TYPE to various place where notifications are being displayed