updating layout to use conditional highlights