Fixing link_resolver
Fixing layout following the removal of some helpers