modified index and layouts