Sorting improvement, CSS changes for colors

Needs a bit more tweaking..