Fixed highlight box overflow issue