Fix data structure to properly display