Highlight design improvements