Minor fix for comment section
re-organize the list