Changed layout and coloring