minor changes to css
merging conflicts fixed