Worked on index layout