Slight reworking on notifications
Style