re-organized content table. Still needs more work