Add index layout
Refactor index