Rework index layouts