Notification Led fixes and Settings reorder