Arrange style.css code
fix conflict