Change to layout, minor tweak to buffers