CS - additions to css layout and deploy tool.