css changes and fixes
conflict resolve