Fix display and element count