final structural changes for now; brought gathering and formatting data pages