label control container update for issue #577