Tidying up index layout