Add Some color and layout