changed color, changed styling
merging
merging and style changes