Add collapsing/expanding
Fix resource linking