sorting
fix 14 day scale and colors