improve layout and color