Improve alignment and layout of the notifications.

Implements diver's mockup from #8566.