Added ids to elements, so linking should actually work soonish