fixed color bug and sorted