Slight changes to the index layout