some css refactoring
merge