updating the css
merging changes with john