A few changes before revamping the CSS