added links to sidebar
fix conflict
fix conflict of merging with ui/node