Notification Panel and QS improvements