Correcting circular reference in 'layout-helper'