Fix data display problems