Changes to make the CSS compatible