fixed some css problems
Merge branch 'css' into dev
updated changes