Added beginnings of new layout