FLUID-5261: More styling; Add UIO