changed some css
files merged