Fix index layout