fix index layout