added basket, fixed treeview navigation