Update to highlight layer to be more uniform.