Relayout ID singleton a bit.