added layouts and index changes