properly saving the layout when using the internal core