CB-7146 moved css out and added some more logs