css: some more improvements to building and apply