Layout adjustments to index