Reworking some of the data display code.