Add indenting and buffer switching