change a lot

1. no color highlight
2. reorder items