Merge "Condense NotifSection + index into a wrapper class"