Additional settings added to tree window with some API cleanups