Better CSS handling