Adding term, menu support, cleaning up views, node support