Add tagbar
Reorder and remove dead configuration