Highlight tweaks for better usability