Add beginnings of layout saving