Improvements to the Comperetor view