Switch from global layout to per-buffer layout