re-established the possibility to override/extend userlink and nav-global blocks, see #335