Converted UnitDisplay to be object oriented