Added tagbar

Also a little bit of cleanup