Index Layout Adjustments