Changed layout of notifications
Merged with master