refactoring
adding colours
change sort order
remove html comments