Update for better view of all notices