Fixing layout following the removal of some helpers