Fix #424 - Corrected display of multiple notifications.

It's rebased, so should be ok.