Improve index layout