Main and Tree js updates