More changes for print formatting (still not working) and cleaning up the entry table some more