Now using a less compact but more easy-to-use data model for Links. Still some issues with 'remove' action, but it is almost there!