updated label control containers for issue #651