Fix display of the notifications (still need to be improved)