changed some stuff, implementing treeview