more color and layout changes