improved index layout