Layout and turpentine update