Fixed some bugs and change some styles for the CSS matcher