Notification New Layout/Fixes