Added sorting and rows coloring