polishing and refactoring some css