Improved notification functionality to work with new layout.