index layout fixes