update with layout tweaks to CH04