Worked on data page layout