Fix Highlight
Fix style