Changed index over to new layout style