update highlight and fix css