style changes
css merges