More color and styles updated