Display labels

Here are my updates to display labels, on top of your valuation refactor.