Change layout, try to make coloring display look good, doesn't yet.