Add simple layout handler (thereby fixing a geometry-editing bug)