diff --git a/src/Widget1.java b/src/Widget1.java
index 2048cf8..41d87d2 100644
--- a/src/Widget1.java
+++ b/src/Widget1.java
@@ -127,41 +127,71 @@
 		if ((curScreen.equals("検索画面結果")&&wid.equals("w0becbeb6b2d54c03a69d63e3facd2eaa"))) {
 			this.curScreen.updateFromState7(curScreen, wid, this.state);
 		}
-		String editcompany = this.editcompany.getValue();
-		String editrepresentative = this.editrepresentative.getValue();
-		String editposition = this.editposition.getValue();
-		String editestablish = this.editestablish.getValue();
-		String editaddress1 = this.editaddress1.getValue();
-		String editaddress2 = this.editaddress2.getValue();
-		String editbusiness1 = this.editbusiness1.getValue();
-		String editbusiness2 = this.editbusiness2.getValue();
-		String editcompanydetail = this.editcompanydetail.getValue();
-		String editURL = this.editURL.getValue();
-		this.widget1 = screen.getWidgets().getWidget(editcompany);
-		String editcompany_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editrepresentative);
-		String editrepresentative_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editposition);
-		String editposition_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editestablish);
-		String editestablish_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editaddress1);
-		String editaddress1_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editaddress2);
-		String editaddress2_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editbusiness1);
-		String editbusiness1_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editbusiness2);
-		String editbusiness2_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editcompanydetail);
-		String editcompanydetail_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(editURL);
-		String editURL_ = this.widget1.getText();
-        Map<String, Map<String, Object>> businessCardManagement = this.businessCardManagement.getValue();
 		if ((curScreen.equals("編集画面２")&&wid.equals("w11dd0f050a5044d384b10351b83ad390"))) {
+            String editcompany = this.editcompany.getValue();
+            String editrepresentative = this.editrepresentative.getValue();
+            String editposition = this.editposition.getValue();
+            String editestablish = this.editestablish.getValue();
+            String editaddress1 = this.editaddress1.getValue();
+            String editaddress2 = this.editaddress2.getValue();
+            String editbusiness1 = this.editbusiness1.getValue();
+            String editbusiness2 = this.editbusiness2.getValue();
+            String editcompanydetail = this.editcompanydetail.getValue();
+            String editURL = this.editURL.getValue();
+            this.widget1 = screen.getWidgets().getWidget(editcompany);
+            String editcompany_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editrepresentative);
+            String editrepresentative_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editposition);
+            String editposition_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editestablish);
+            String editestablish_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editaddress1);
+            String editaddress1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editaddress2);
+            String editaddress2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editbusiness1);
+            String editbusiness1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editbusiness2);
+            String editbusiness2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editcompanydetail);
+            String editcompanydetail_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editURL);
+            String editURL_ = this.widget1.getText();
 			this.businessCardManagement.updateFromState3(curScreen, wid, this.state, editcompany_, editcompany, editrepresentative_, editrepresentative, editposition_, editposition, editestablish_, editestablish, editaddress1_, editaddress1, editaddress2_, editaddress2, editbusiness1_, editbusiness1, editbusiness2_, editbusiness2, editcompanydetail_, editcompanydetail, editURL_, editURL);
 		}
 		if ((curScreen.equals("編集画面２")&&wid.equals("w11dd0f050a5044d384b10351b83ad390"))) {
+            String editcompany = this.editcompany.getValue();
+            String editrepresentative = this.editrepresentative.getValue();
+            String editposition = this.editposition.getValue();
+            String editestablish = this.editestablish.getValue();
+            String editaddress1 = this.editaddress1.getValue();
+            String editaddress2 = this.editaddress2.getValue();
+            String editbusiness1 = this.editbusiness1.getValue();
+            String editbusiness2 = this.editbusiness2.getValue();
+            String editcompanydetail = this.editcompanydetail.getValue();
+            String editURL = this.editURL.getValue();
+            this.widget1 = screen.getWidgets().getWidget(editcompany);
+            String editcompany_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editrepresentative);
+            String editrepresentative_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editposition);
+            String editposition_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editestablish);
+            String editestablish_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editaddress1);
+            String editaddress1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editaddress2);
+            String editaddress2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editbusiness1);
+            String editbusiness1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editbusiness2);
+            String editbusiness2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editcompanydetail);
+            String editcompanydetail_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(editURL);
+            String editURL_ = this.widget1.getText();
+            Map<String, Map<String, Object>> businessCardManagement = this.businessCardManagement.getValue();
 			this.curScreen.updateFromState5(curScreen, wid, this.state, editcompany_, editcompany, editrepresentative_, editrepresentative, editposition_, editposition, editestablish_, editestablish, editaddress1_, editaddress1, editaddress2_, editaddress2, editbusiness1_, editbusiness1, editbusiness2_, editbusiness2, editcompanydetail_, editcompanydetail, editURL_, editURL, businessCardManagement);
 		}
 		if ((curScreen.equals("検索項目画面")&&wid.equals("w614b5ee1e161473d8f859fbfb5c8074e"))) {
@@ -176,60 +206,145 @@
 		if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) {
 			this.curScreen.updateFromState(curScreen, wid, this.state);
 		}
-		String company = this.company.getValue();
-		String representative = this.representative.getValue();
-		String position = this.position.getValue();
-		String establishment = this.establishment.getValue();
-		String address1 = this.address1.getValue();
-		String address2 = this.address2.getValue();
-		String businessdescription1 = this.businessdescription1.getValue();
-		String businessdescription2 = this.businessdescription2.getValue();
-		String companyoverview = this.companyoverview.getValue();
-		String URL = this.URL.getValue();
-		this.widget1 = screen.getWidgets().getWidget(company);
-		String company_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(representative);
-		String representative_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(position);
-		String position_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(establishment);
-		String establishment_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(address1);
-		String address1_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(address2);
-		String address2_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(businessdescription1);
-		String businessdescription1_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(businessdescription2);
-		String businessdescription2_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(companyoverview);
-		String companyoverview_ = this.widget1.getText();
-		this.widget1 = screen.getWidgets().getWidget(URL);
-		String URL_ = this.widget1.getText();
 		if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) {
+            String company = this.company.getValue();
+            String representative = this.representative.getValue();
+            String position = this.position.getValue();
+            String establishment = this.establishment.getValue();
+            String address1 = this.address1.getValue();
+            String address2 = this.address2.getValue();
+            String businessdescription1 = this.businessdescription1.getValue();
+            String businessdescription2 = this.businessdescription2.getValue();
+            String companyoverview = this.companyoverview.getValue();
+            String URL = this.URL.getValue();
+            this.widget1 = screen.getWidgets().getWidget(company);
+            String company_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(representative);
+            String representative_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(position);
+            String position_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(establishment);
+            String establishment_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address1);
+            String address1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address2);
+            String address2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription1);
+            String businessdescription1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription2);
+            String businessdescription2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(companyoverview);
+            String companyoverview_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(URL);
+            String URL_ = this.widget1.getText();
 			this.businessCardManagement.updateFromState(curScreen, wid, this.state, company_, company, representative_, representative, position_, position, establishment_, establishment, address1_, address1, address2_, address2, businessdescription1_, businessdescription1, businessdescription2_, businessdescription2, companyoverview_, companyoverview, URL_, URL);
 		}
 		if ((curScreen.equals("登録画面１")&&wid.equals("w7c6cfb14ed4f410aa33a440e6ab2e4bf"))) {
+            String company = this.company.getValue();
+            String representative = this.representative.getValue();
+            String position = this.position.getValue();
+            String establishment = this.establishment.getValue();
+            String address1 = this.address1.getValue();
+            String address2 = this.address2.getValue();
+            String businessdescription1 = this.businessdescription1.getValue();
+            String businessdescription2 = this.businessdescription2.getValue();
+            String companyoverview = this.companyoverview.getValue();
+            String URL = this.URL.getValue();
+            this.widget1 = screen.getWidgets().getWidget(company);
+            String company_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(representative);
+            String representative_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(position);
+            String position_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(establishment);
+            String establishment_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address1);
+            String address1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address2);
+            String address2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription1);
+            String businessdescription1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription2);
+            String businessdescription2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(companyoverview);
+            String companyoverview_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(URL);
+            String URL_ = this.widget1.getText();
 			this.businessCardManagement.updateFromState2(curScreen, wid, this.state, company_, representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_);
 		}
 		if ((curScreen.equals("登録画面１")&&wid.equals("w7c6cfb14ed4f410aa33a440e6ab2e4bf"))) {
+            String company = this.company.getValue();
+            String representative = this.representative.getValue();
+            String position = this.position.getValue();
+            String establishment = this.establishment.getValue();
+            String address1 = this.address1.getValue();
+            String address2 = this.address2.getValue();
+            String businessdescription1 = this.businessdescription1.getValue();
+            String businessdescription2 = this.businessdescription2.getValue();
+            String companyoverview = this.companyoverview.getValue();
+            String URL = this.URL.getValue();
+            this.widget1 = screen.getWidgets().getWidget(company);
+            String company_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(representative);
+            String representative_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(position);
+            String position_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(establishment);
+            String establishment_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address1);
+            String address1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address2);
+            String address2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription1);
+            String businessdescription1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription2);
+            String businessdescription2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(companyoverview);
+            String companyoverview_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(URL);
+            String URL_ = this.widget1.getText();
+            Map<String, Map<String, Object>> businessCardManagement = this.businessCardManagement.getValue();
 			this.curScreen.updateFromState6(curScreen, wid, this.state, company_, representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_, businessCardManagement);
 		}
-		String search6 = this.search6.getValue();
-		String searchCriteriaScreen = this.searchCriteriaScreen.getValue();
-		String search3 = this.search3.getValue();
-		String search5 = this.search5.getValue();
-		String search1 = this.search1.getValue();
-		String result = this.result.getValue();
-		String search2 = this.search2.getValue();
-		this.widget1 = screen.getWidgets().getWidget(search6);
-		this.widget1 = screen.getWidgets().getWidget(search1);
-		this.widget1 = screen.getWidgets().getWidget(search2);
-		this.widget1 = screen.getWidgets().getWidget(search3);
-		this.widget1 = screen.getWidgets().getWidget(search5);
-		this.widget1 = screen.getWidgets().getWidget(result);
 		if ((curScreen.equals("検索項目画面")&&wid.equals("w725d1e48b8584a70bad1fbdc07ea8280"))) {
-			this.widget1.updateDataFromState(curScreen, wid, this.state, searchCriteriaScreen, search1, search2, search3, search5, search6, result, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, businessCardManagement);
+            String searchCriteriaScreen = this.searchCriteriaScreen.getValue();
+            String search1 = this.search1.getValue();
+            String search2 = this.search2.getValue();
+            String search3 = this.search3.getValue();
+            String search5 = this.search5.getValue();
+            String search6 = this.search6.getValue();
+            String result = this.result.getValue();
+            String address1 = this.address1.getValue();
+            String address2 = this.address2.getValue();
+            String businessdescription1 = this.businessdescription1.getValue();
+            String businessdescription2 = this.businessdescription2.getValue();
+            String companyoverview = this.companyoverview.getValue();
+            this.widget1 = screen.getWidgets().getWidget(searchCriteriaScreen);
+            String searchCriteriaScreen_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(search1);
+            String search1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(search2);
+            String search2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(search3);
+            String search3_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(search5);
+            String search5_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(search6);
+            String search6_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(result);
+            String result_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address1);
+            String address1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(address2);
+            String address2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription1);
+            String businessdescription1_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(businessdescription2);
+            String businessdescription2_ = this.widget1.getText();
+            this.widget1 = screen.getWidgets().getWidget(companyoverview);
+            String companyoverview_ = this.widget1.getText();
+            Map<String, Map<String, Object>> businessCardManagement = this.businessCardManagement.getValue();
+			this.widget1.updateDataFromState(curScreen, wid, this.state, searchCriteriaScreen_, search1_, search2_, search3_, search5_, search6_, result_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, businessCardManagement);
 		}
 	}
 	public void setReferences(Screen screen, BusinessCardManagement businessCardManagement, CurScreen curScreen, Editcompany editcompany, Editaddress1 editaddress1, Editbusiness1 editbusiness1, Editestablish editestablish, Editbusiness2 editbusiness2, Editposition editposition, Editcompanydetail editcompanydetail, EditURL editURL, Editaddress2 editaddress2, Editrepresentative editrepresentative, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) {