Add sorting and coloring