fix how to improve color and layout