CSS restructered