top right notifications - fix a few things