More color and styling fixes