fixes some of the looping logic and moves display of non-existent data to be a concern of the helpers that are rendering it