Added reorginsation of list to display in groups