Some reorganization, new CSS-style