Notifications: Layout code cleanup