Further work on notifications screen and associated buttons