retooled layout mechanism