Update to color and positioning