Updated layouts and index