rudimentary layout-saving system added