Correctly update labels when data changes