Merge "Refactored the layout of a notifications"