Fix a bug
Change highlight color