Latest version of CSS from Jack and updated controls from dev lib