Update to label display and Fixes gh-2