Fix saving of layout for empty layouts