Refactoring.
Refactoring highlighting.
Removing highlight.
Removing stats, fixing sort arrow.
Minor tweak.