Minor clean-up, and hide notification popups when read