Further improvements on css inlining