modification for core-bundle 2.0.0, css improvements