Fix tree positioning
merge master
rebuild for prod