Small changes to CSS and parsing