Fixed controller DI, implemented barebone treeview+contextmenu