tyo and css fixes
conflict resolved