Added nerttree tabs and fixed some mapping conflicts