FLUID-5520: Starting style changes to respond to UIO better.