move more display code into the display file/struct