Changed text color
Changed text color and layout
Fixed merge conflick
Fixed css colors so that they are better for users to read