partial and css changes
merge conflict