refactoring layout facets saving (#154)