CSS restructure