Fix buffer swapping in NerdTree, move buftabs to status line and add highlight