Reworked the highlighting and show invisibles