Moving "edit tree" button next to "add new" (fixes #8119)