part 1 complete exept data table issue & 1 new page