Clean up conformance highlighting and add barebones popover support