standardizing css
merging