Break up links with nested formating

Created by: riyad

Breaks up "block links" to be simpler and contain less "structure" (i.e. HTML) so that the structure is outside and the links encapsulate only the text.

Depends on merge request #1127. This is also in preparation for changes regarding #527 (closed).