diff --git a/src/Main.java b/src/Main.java
index 6eae838..cef5557 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -78,7 +78,7 @@
 		this.company = new Company(screen);
 		this.address1 = new Address1(screen);
 		this.representative = new Representative(screen);
-		this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search2);
+		this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search2, search3, search5, search6, result);
 		changeCurScreen("企業一覧");
 	}
 	public Map<String, Object> getBusinessCardManagementElement(String companyName) {
diff --git a/src/ScreenTemplate.java b/src/ScreenTemplate.java
index c17d1b4..32899ae 100644
--- a/src/ScreenTemplate.java
+++ b/src/ScreenTemplate.java
@@ -31,9 +31,9 @@
 	public ScreenTemplate() {
 		this.widgets = new Widgets1();
 	}
-	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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) {
+	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result) {
 		this.curScreen = curScreen;
 		this.presenter = presenter;
-		this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search);
+		this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search2, search3, search5, search6, result);
 	}
 }
\ No newline at end of file
diff --git a/src/ScreenTemplates.java b/src/ScreenTemplates.java
index 46b4732..7a21c48 100644
--- a/src/ScreenTemplates.java
+++ b/src/ScreenTemplates.java
@@ -6,64 +6,65 @@
 	private Map<String, ScreenTemplate> value = new HashMap<>();
 	{
 		Map<String, Object> temp_json5 = new HashMap<>();
+		temp_json5.put("representative", "_");
+		temp_json5.put("担当者１", "_");
+		temp_json5.put("position", "_");
 		temp_json5.put("address2", "_");
 		temp_json5.put("address1", "_");
-		temp_json5.put("担当者１", "_");
 		temp_json5.put("電話番号１", "_");
 		temp_json5.put("establishment", "_");
-		temp_json5.put("position", "_");
 		temp_json5.put("businessDescription1", "_");
-		temp_json5.put("representative", "_");
 		temp_json5.put("companyOverview", "_");
 		temp_json5.put("URL", "_");
 		temp_json5.put("businessDescription2", "_");
 		Map<String, Object> temp_json4 = new HashMap<>();
 		temp_json4.put("_", temp_json5);
-		new ArrayList<>().add("電話番号１");
-		new ArrayList<>().add("担当者１");
-		new ArrayList<>().add("URL");
-		new ArrayList<>().add("会社概要");
-		new ArrayList<>().add("事業内容２");
-		new ArrayList<>().add("事業内容１");
-		new ArrayList<>().add("住所２");
-		new ArrayList<>().add("住所１");
-		new ArrayList<>().add("設立");
-		new ArrayList<>().add("役職");
-		new ArrayList<>().add("代表者");
+		List<String> temp_list1 = new ArrayList<>();
+		temp_list1.add("電話番号１");
+		temp_list1.add("担当者１");
+		temp_list1.add("URL");
+		temp_list1.add("会社概要");
+		temp_list1.add("事業内容２");
+		temp_list1.add("事業内容１");
+		temp_list1.add("住所２");
+		temp_list1.add("住所１");
+		temp_list1.add("設立");
+		temp_list1.add("役職");
+		temp_list1.add("代表者");
 		Map<String, Object> temp_json3 = new HashMap<>();
-		temp_json3.put("visible", true);
-		temp_json3.put("data", temp_json4);
-		temp_json3.put("columns", new ArrayList<>());
-		temp_json3.put("x", 74);
-		temp_json3.put("width", 2325);
-		temp_json3.put("y", 267);
-		temp_json3.put("text", "");
 		temp_json3.put("type", "table");
-		temp_json3.put("primaryKeyName", "会社名");
+		temp_json3.put("text", "");
+		temp_json3.put("visible", true);
+		temp_json3.put("x", 74);
+		temp_json3.put("y", 267);
+		temp_json3.put("width", 2325);
 		temp_json3.put("height", 1136);
+		temp_json3.put("data", temp_json4);
+		temp_json3.put("columns", temp_list1);
+		temp_json3.put("primaryKeyName", "会社名");
 		Map<String, Object> temp_json6 = new HashMap<>();
+		temp_json6.put("type", "button");
+		temp_json6.put("text", "戻る");
 		temp_json6.put("visible", true);
 		temp_json6.put("x", 2070);
-		temp_json6.put("width", 237);
 		temp_json6.put("y", 112);
-		temp_json6.put("text", "戻る");
-		temp_json6.put("type", "button");
+		temp_json6.put("width", 237);
 		temp_json6.put("height", 96);
 		Map<String, Object> temp_json7 = new HashMap<>();
+		temp_json7.put("type", "label");
+		temp_json7.put("text", "検索画面");
 		temp_json7.put("visible", true);
 		temp_json7.put("x", 120);
-		temp_json7.put("width", 320);
 		temp_json7.put("y", 86);
-		temp_json7.put("text", "検索画面");
-		temp_json7.put("type", "label");
+		temp_json7.put("width", 320);
 		temp_json7.put("height", 38);
 		Map<String, Object> temp_json8 = new HashMap<>();
+		temp_json8.put("type", "button");
+		temp_json8.put("text", "検索項目");
 		temp_json8.put("visible", true);
 		temp_json8.put("x", 1757);
-		temp_json8.put("width", 250);
 		temp_json8.put("y", 112);
-		temp_json8.put("text", "検索項目");
-		temp_json8.put("type", "button");
+		temp_json8.put("width", 250);
 		temp_json8.put("height", 96);
 		Map<String, Object> temp_json2 = new HashMap<>();
 		temp_json2.put("w4ca84254d30c423ab8e449171a5b5123", temp_json3);
@@ -75,12 +76,12 @@
 		temp_json1.put("layout", false);
 		temp_json1.put("widgets", temp_json2);
 		Map<String, Object> temp_json11 = new HashMap<>();
+		temp_json11.put("type", "button");
+		temp_json11.put("text", "戻る");
 		temp_json11.put("visible", true);
 		temp_json11.put("x", 2021);
-		temp_json11.put("width", 267);
 		temp_json11.put("y", 82);
-		temp_json11.put("text", "戻る");
-		temp_json11.put("type", "button");
+		temp_json11.put("width", 267);
 		temp_json11.put("height", 96);
 		Map<String, Object> temp_json10 = new HashMap<>();
 		temp_json10.put("w0becbeb6b2d54c03a69d63e3facd2eaa", temp_json11);
@@ -89,36 +90,36 @@
 		temp_json9.put("layout", false);
 		temp_json9.put("widgets", temp_json10);
 		Map<String, Object> temp_json14 = new HashMap<>();
+		temp_json14.put("type", "label");
+		temp_json14.put("text", "住所２");
 		temp_json14.put("visible", true);
 		temp_json14.put("x", 704);
-		temp_json14.put("width", 96);
 		temp_json14.put("y", 720);
-		temp_json14.put("text", "住所２");
-		temp_json14.put("type", "label");
+		temp_json14.put("width", 96);
 		temp_json14.put("height", 38);
 		Map<String, Object> temp_json15 = new HashMap<>();
+		temp_json15.put("type", "label");
+		temp_json15.put("text", "担当者");
 		temp_json15.put("visible", true);
 		temp_json15.put("x", 1296);
-		temp_json15.put("width", 96);
 		temp_json15.put("y", 720);
-		temp_json15.put("text", "担当者");
-		temp_json15.put("type", "label");
+		temp_json15.put("width", 96);
 		temp_json15.put("height", 38);
 		Map<String, Object> temp_json16 = new HashMap<>();
+		temp_json16.put("type", "label");
+		temp_json16.put("text", "事業内容１");
 		temp_json16.put("visible", true);
 		temp_json16.put("x", 112);
-		temp_json16.put("width", 160);
 		temp_json16.put("y", 352);
-		temp_json16.put("text", "事業内容１");
-		temp_json16.put("type", "label");
+		temp_json16.put("width", 160);
 		temp_json16.put("height", 38);
 		Map<String, Object> temp_json17 = new HashMap<>();
+		temp_json17.put("type", "label");
+		temp_json17.put("text", "事業内容２");
 		temp_json17.put("visible", true);
 		temp_json17.put("x", 704);
-		temp_json17.put("width", 160);
 		temp_json17.put("y", 352);
-		temp_json17.put("text", "事業内容２");
-		temp_json17.put("type", "label");
+		temp_json17.put("width", 160);
 		temp_json17.put("height", 38);
 		Map<String, Object> temp_json20 = new HashMap<>();
 		temp_json20.put("address2", "_");
@@ -132,121 +133,122 @@
 		temp_json20.put("businessDescription2", "_");
 		Map<String, Object> temp_json19 = new HashMap<>();
 		temp_json19.put("_", temp_json20);
-		new ArrayList<>().add("URL");
-		new ArrayList<>().add("会社概要");
-		new ArrayList<>().add("事業内容２");
-		new ArrayList<>().add("事業内容１");
-		new ArrayList<>().add("住所２");
-		new ArrayList<>().add("住所１");
-		new ArrayList<>().add("設立");
-		new ArrayList<>().add("役職");
-		new ArrayList<>().add("代表者");
+		List<String> temp_list2 = new ArrayList<>();
+		temp_list2.add("URL");
+		temp_list2.add("会社概要");
+		temp_list2.add("事業内容２");
+		temp_list2.add("事業内容１");
+		temp_list2.add("住所２");
+		temp_list2.add("住所１");
+		temp_list2.add("設立");
+		temp_list2.add("役職");
+		temp_list2.add("代表者");
 		Map<String, Object> temp_json18 = new HashMap<>();
-		temp_json18.put("visible", true);
-		temp_json18.put("data", temp_json19);
-		temp_json18.put("columns", new ArrayList<>());
-		temp_json18.put("x", 106);
-		temp_json18.put("width", 2662);
-		temp_json18.put("y", 1021);
-		temp_json18.put("text", "table");
 		temp_json18.put("type", "table");
-		temp_json18.put("primaryKeyName", "会社名");
+		temp_json18.put("text", "table");
+		temp_json18.put("visible", true);
+		temp_json18.put("x", 106);
+		temp_json18.put("y", 1021);
+		temp_json18.put("width", 2662);
 		temp_json18.put("height", 757);
+		temp_json18.put("data", temp_json19);
+		temp_json18.put("columns", temp_list2);
+		temp_json18.put("primaryKeyName", "会社名");
 		Map<String, Object> temp_json21 = new HashMap<>();
+		temp_json21.put("type", "label");
+		temp_json21.put("text", "会社概要");
 		temp_json21.put("visible", true);
 		temp_json21.put("x", 1296);
-		temp_json21.put("width", 160);
 		temp_json21.put("y", 352);
-		temp_json21.put("text", "会社概要");
-		temp_json21.put("type", "label");
+		temp_json21.put("width", 160);
 		temp_json21.put("height", 38);
 		Map<String, Object> temp_json22 = new HashMap<>();
+		temp_json22.put("type", "label");
+		temp_json22.put("text", "住所１");
 		temp_json22.put("visible", true);
 		temp_json22.put("x", 112);
-		temp_json22.put("width", 96);
 		temp_json22.put("y", 720);
-		temp_json22.put("text", "住所１");
-		temp_json22.put("type", "label");
+		temp_json22.put("width", 96);
 		temp_json22.put("height", 38);
 		Map<String, Object> temp_json23 = new HashMap<>();
+		temp_json23.put("type", "button");
+		temp_json23.put("text", "検索");
 		temp_json23.put("visible", true);
 		temp_json23.put("x", 2054);
-		temp_json23.put("width", 210);
 		temp_json23.put("y", 184);
-		temp_json23.put("text", "検索");
-		temp_json23.put("type", "button");
+		temp_json23.put("width", 210);
 		temp_json23.put("height", 82);
 		Map<String, Object> temp_json24 = new HashMap<>();
+		temp_json24.put("type", "textInput");
+		temp_json24.put("text", "textInput");
 		temp_json24.put("visible", true);
 		temp_json24.put("x", 704);
-		temp_json24.put("width", 528);
 		temp_json24.put("y", 400);
-		temp_json24.put("text", "textInput");
-		temp_json24.put("type", "textInput");
+		temp_json24.put("width", 528);
 		temp_json24.put("height", 128);
 		Map<String, Object> temp_json25 = new HashMap<>();
+		temp_json25.put("type", "label");
+		temp_json25.put("text", "会社名");
 		temp_json25.put("visible", true);
 		temp_json25.put("x", 1888);
-		temp_json25.put("width", 282);
 		temp_json25.put("y", 352);
-		temp_json25.put("text", "会社名");
-		temp_json25.put("type", "label");
+		temp_json25.put("width", 282);
 		temp_json25.put("height", 29);
 		Map<String, Object> temp_json26 = new HashMap<>();
+		temp_json26.put("type", "textInput");
+		temp_json26.put("text", "textInput");
 		temp_json26.put("visible", true);
 		temp_json26.put("x", 1296);
-		temp_json26.put("width", 528);
 		temp_json26.put("y", 400);
-		temp_json26.put("text", "textInput");
-		temp_json26.put("type", "textInput");
+		temp_json26.put("width", 528);
 		temp_json26.put("height", 128);
 		Map<String, Object> temp_json27 = new HashMap<>();
+		temp_json27.put("type", "button");
+		temp_json27.put("text", "一覧");
 		temp_json27.put("visible", true);
 		temp_json27.put("x", 1789);
-		temp_json27.put("width", 176);
 		temp_json27.put("y", 184);
-		temp_json27.put("text", "一覧");
-		temp_json27.put("type", "button");
+		temp_json27.put("width", 176);
 		temp_json27.put("height", 80);
 		Map<String, Object> temp_json28 = new HashMap<>();
+		temp_json28.put("type", "textInput");
+		temp_json28.put("text", "textInput");
 		temp_json28.put("visible", true);
 		temp_json28.put("x", 112);
-		temp_json28.put("width", 528);
 		temp_json28.put("y", 400);
-		temp_json28.put("text", "textInput");
-		temp_json28.put("type", "textInput");
+		temp_json28.put("width", 528);
 		temp_json28.put("height", 128);
 		Map<String, Object> temp_json29 = new HashMap<>();
+		temp_json29.put("type", "textInput");
+		temp_json29.put("text", "textInput");
 		temp_json29.put("visible", true);
 		temp_json29.put("x", 704);
-		temp_json29.put("width", 528);
 		temp_json29.put("y", 768);
-		temp_json29.put("text", "textInput");
-		temp_json29.put("type", "textInput");
+		temp_json29.put("width", 528);
 		temp_json29.put("height", 128);
 		Map<String, Object> temp_json30 = new HashMap<>();
+		temp_json30.put("type", "textInput");
+		temp_json30.put("text", "textInput");
 		temp_json30.put("visible", true);
 		temp_json30.put("x", 1296);
-		temp_json30.put("width", 528);
 		temp_json30.put("y", 768);
-		temp_json30.put("text", "textInput");
-		temp_json30.put("type", "textInput");
+		temp_json30.put("width", 528);
 		temp_json30.put("height", 128);
 		Map<String, Object> temp_json31 = new HashMap<>();
+		temp_json31.put("type", "textInput");
+		temp_json31.put("text", "textInput");
 		temp_json31.put("visible", true);
 		temp_json31.put("x", 1888);
-		temp_json31.put("width", 528);
 		temp_json31.put("y", 400);
-		temp_json31.put("text", "textInput");
-		temp_json31.put("type", "textInput");
+		temp_json31.put("width", 528);
 		temp_json31.put("height", 128);
 		Map<String, Object> temp_json32 = new HashMap<>();
+		temp_json32.put("type", "textInput");
+		temp_json32.put("text", "textInput");
 		temp_json32.put("visible", true);
 		temp_json32.put("x", 112);
-		temp_json32.put("width", 528);
 		temp_json32.put("y", 768);
-		temp_json32.put("text", "textInput");
-		temp_json32.put("type", "textInput");
+		temp_json32.put("width", 528);
 		temp_json32.put("height", 128);
 		Map<String, Object> temp_json13 = new HashMap<>();
 		temp_json13.put("w8fd9daaa986d40978c63408ee0a9527f", temp_json14);
@@ -271,188 +273,188 @@
 		temp_json12.put("layout", false);
 		temp_json12.put("widgets", temp_json13);
 		Map<String, Object> temp_json35 = new HashMap<>();
+		temp_json35.put("type", "label");
+		temp_json35.put("text", "");
 		temp_json35.put("visible", true);
 		temp_json35.put("x", 1445);
-		temp_json35.put("width", 96);
 		temp_json35.put("y", 403);
-		temp_json35.put("text", "");
-		temp_json35.put("type", "label");
+		temp_json35.put("width", 96);
 		temp_json35.put("height", 38);
 		Map<String, Object> temp_json36 = new HashMap<>();
+		temp_json36.put("type", "label");
+		temp_json36.put("text", "住所２");
 		temp_json36.put("visible", true);
 		temp_json36.put("x", 832);
-		temp_json36.put("width", 96);
 		temp_json36.put("y", 723);
-		temp_json36.put("text", "住所２");
-		temp_json36.put("type", "label");
+		temp_json36.put("width", 96);
 		temp_json36.put("height", 38);
 		Map<String, Object> temp_json37 = new HashMap<>();
+		temp_json37.put("type", "button");
+		temp_json37.put("text", "キャンセル");
 		temp_json37.put("visible", true);
 		temp_json37.put("x", 2171);
-		temp_json37.put("width", 240);
 		temp_json37.put("y", 96);
-		temp_json37.put("text", "キャンセル");
-		temp_json37.put("type", "button");
+		temp_json37.put("width", 240);
 		temp_json37.put("height", 120);
 		Map<String, Object> temp_json38 = new HashMap<>();
+		temp_json38.put("type", "label");
+		temp_json38.put("text", "役職");
 		temp_json38.put("visible", true);
 		temp_json38.put("x", 1440);
-		temp_json38.put("width", 96);
 		temp_json38.put("y", 403);
-		temp_json38.put("text", "役職");
-		temp_json38.put("type", "label");
+		temp_json38.put("width", 96);
 		temp_json38.put("height", 38);
 		Map<String, Object> temp_json39 = new HashMap<>();
+		temp_json39.put("type", "textInput");
+		temp_json39.put("text", "textInput");
 		temp_json39.put("visible", true);
 		temp_json39.put("x", 832);
-		temp_json39.put("width", 560);
 		temp_json39.put("y", 768);
-		temp_json39.put("text", "textInput");
-		temp_json39.put("type", "textInput");
+		temp_json39.put("width", 560);
 		temp_json39.put("height", 128);
 		Map<String, Object> temp_json40 = new HashMap<>();
+		temp_json40.put("type", "label");
+		temp_json40.put("text", "URL");
 		temp_json40.put("visible", true);
 		temp_json40.put("x", 832);
-		temp_json40.put("width", 96);
 		temp_json40.put("y", 1035);
-		temp_json40.put("text", "URL");
-		temp_json40.put("type", "label");
+		temp_json40.put("width", 96);
 		temp_json40.put("height", 38);
 		Map<String, Object> temp_json41 = new HashMap<>();
+		temp_json41.put("type", "textInput");
+		temp_json41.put("text", "textInput");
 		temp_json41.put("visible", true);
 		temp_json41.put("x", 1440);
-		temp_json41.put("width", 560);
 		temp_json41.put("y", 768);
-		temp_json41.put("text", "textInput");
-		temp_json41.put("type", "textInput");
+		temp_json41.put("width", 560);
 		temp_json41.put("height", 128);
 		Map<String, Object> temp_json42 = new HashMap<>();
+		temp_json42.put("type", "textInput");
+		temp_json42.put("text", "textInput");
 		temp_json42.put("visible", true);
 		temp_json42.put("x", 2064);
-		temp_json42.put("width", 560);
 		temp_json42.put("y", 448);
-		temp_json42.put("text", "textInput");
-		temp_json42.put("type", "textInput");
+		temp_json42.put("width", 560);
 		temp_json42.put("height", 128);
 		Map<String, Object> temp_json43 = new HashMap<>();
+		temp_json43.put("type", "textInput");
+		temp_json43.put("text", "textInput");
 		temp_json43.put("visible", true);
 		temp_json43.put("x", 832);
-		temp_json43.put("width", 560);
 		temp_json43.put("y", 448);
-		temp_json43.put("text", "textInput");
-		temp_json43.put("type", "textInput");
+		temp_json43.put("width", 560);
 		temp_json43.put("height", 128);
 		Map<String, Object> temp_json44 = new HashMap<>();
+		temp_json44.put("type", "label");
+		temp_json44.put("text", "設立");
 		temp_json44.put("visible", true);
 		temp_json44.put("x", 2064);
-		temp_json44.put("width", 96);
 		temp_json44.put("y", 402);
-		temp_json44.put("text", "設立");
-		temp_json44.put("type", "label");
+		temp_json44.put("width", 96);
 		temp_json44.put("height", 38);
 		Map<String, Object> temp_json45 = new HashMap<>();
+		temp_json45.put("type", "label");
+		temp_json45.put("text", "住所１");
 		temp_json45.put("visible", true);
 		temp_json45.put("x", 224);
-		temp_json45.put("width", 96);
 		temp_json45.put("y", 725);
-		temp_json45.put("text", "住所１");
-		temp_json45.put("type", "label");
+		temp_json45.put("width", 96);
 		temp_json45.put("height", 38);
 		Map<String, Object> temp_json46 = new HashMap<>();
+		temp_json46.put("type", "label");
+		temp_json46.put("text", "会社名");
 		temp_json46.put("visible", true);
 		temp_json46.put("x", 224);
-		temp_json46.put("width", 96);
 		temp_json46.put("y", 408);
-		temp_json46.put("text", "会社名");
-		temp_json46.put("type", "label");
+		temp_json46.put("width", 96);
 		temp_json46.put("height", 38);
 		Map<String, Object> temp_json47 = new HashMap<>();
+		temp_json47.put("type", "textInput");
+		temp_json47.put("text", "textInput");
 		temp_json47.put("visible", true);
 		temp_json47.put("x", 832);
-		temp_json47.put("width", 560);
 		temp_json47.put("y", 1088);
-		temp_json47.put("text", "textInput");
-		temp_json47.put("type", "textInput");
+		temp_json47.put("width", 560);
 		temp_json47.put("height", 128);
 		Map<String, Object> temp_json48 = new HashMap<>();
+		temp_json48.put("type", "textInput");
+		temp_json48.put("text", "textInput");
 		temp_json48.put("visible", true);
 		temp_json48.put("x", 1440);
-		temp_json48.put("width", 560);
 		temp_json48.put("y", 450);
-		temp_json48.put("text", "textInput");
-		temp_json48.put("type", "textInput");
+		temp_json48.put("width", 560);
 		temp_json48.put("height", 128);
 		Map<String, Object> temp_json49 = new HashMap<>();
+		temp_json49.put("type", "label");
+		temp_json49.put("text", "会社概要");
 		temp_json49.put("visible", true);
 		temp_json49.put("x", 224);
-		temp_json49.put("width", 96);
 		temp_json49.put("y", 1038);
-		temp_json49.put("text", "会社概要");
-		temp_json49.put("type", "label");
+		temp_json49.put("width", 96);
 		temp_json49.put("height", 38);
 		Map<String, Object> temp_json50 = new HashMap<>();
+		temp_json50.put("type", "label");
+		temp_json50.put("text", "事業内容２");
 		temp_json50.put("visible", true);
 		temp_json50.put("x", 2064);
-		temp_json50.put("width", 128);
 		temp_json50.put("y", 728);
-		temp_json50.put("text", "事業内容２");
-		temp_json50.put("type", "label");
+		temp_json50.put("width", 128);
 		temp_json50.put("height", 38);
 		Map<String, Object> temp_json51 = new HashMap<>();
+		temp_json51.put("type", "textInput");
+		temp_json51.put("text", "textInput");
 		temp_json51.put("visible", true);
 		temp_json51.put("x", 2064);
-		temp_json51.put("width", 560);
 		temp_json51.put("y", 768);
-		temp_json51.put("text", "textInput");
-		temp_json51.put("type", "textInput");
+		temp_json51.put("width", 560);
 		temp_json51.put("height", 128);
 		Map<String, Object> temp_json52 = new HashMap<>();
+		temp_json52.put("type", "button");
+		temp_json52.put("text", "編集");
 		temp_json52.put("visible", true);
 		temp_json52.put("x", 2461);
-		temp_json52.put("width", 256);
 		temp_json52.put("y", 96);
-		temp_json52.put("text", "編集");
-		temp_json52.put("type", "button");
+		temp_json52.put("width", 256);
 		temp_json52.put("height", 120);
 		Map<String, Object> temp_json53 = new HashMap<>();
+		temp_json53.put("type", "textInput");
+		temp_json53.put("text", "textInput");
 		temp_json53.put("visible", true);
 		temp_json53.put("x", 224);
-		temp_json53.put("width", 560);
 		temp_json53.put("y", 448);
-		temp_json53.put("text", "textInput");
-		temp_json53.put("type", "textInput");
+		temp_json53.put("width", 560);
 		temp_json53.put("height", 128);
 		Map<String, Object> temp_json54 = new HashMap<>();
+		temp_json54.put("type", "textInput");
+		temp_json54.put("text", "textInput");
 		temp_json54.put("visible", true);
 		temp_json54.put("x", 224);
-		temp_json54.put("width", 560);
 		temp_json54.put("y", 1088);
-		temp_json54.put("text", "textInput");
-		temp_json54.put("type", "textInput");
+		temp_json54.put("width", 560);
 		temp_json54.put("height", 128);
 		Map<String, Object> temp_json55 = new HashMap<>();
+		temp_json55.put("type", "label");
+		temp_json55.put("text", "事業内容１");
 		temp_json55.put("visible", true);
 		temp_json55.put("x", 1445);
-		temp_json55.put("width", 160);
 		temp_json55.put("y", 728);
-		temp_json55.put("text", "事業内容１");
-		temp_json55.put("type", "label");
+		temp_json55.put("width", 160);
 		temp_json55.put("height", 38);
 		Map<String, Object> temp_json56 = new HashMap<>();
+		temp_json56.put("type", "textInput");
+		temp_json56.put("text", "textInput");
 		temp_json56.put("visible", true);
 		temp_json56.put("x", 224);
-		temp_json56.put("width", 560);
 		temp_json56.put("y", 768);
-		temp_json56.put("text", "textInput");
-		temp_json56.put("type", "textInput");
+		temp_json56.put("width", 560);
 		temp_json56.put("height", 128);
 		Map<String, Object> temp_json57 = new HashMap<>();
+		temp_json57.put("type", "label");
+		temp_json57.put("text", "代表者");
 		temp_json57.put("visible", true);
 		temp_json57.put("x", 842);
-		temp_json57.put("width", 96);
 		temp_json57.put("y", 408);
-		temp_json57.put("text", "代表者");
-		temp_json57.put("type", "label");
+		temp_json57.put("width", 96);
 		temp_json57.put("height", 38);
 		Map<String, Object> temp_json34 = new HashMap<>();
 		temp_json34.put("w92f10414281e4aba83b435456a1315b1", temp_json35);
@@ -483,20 +485,20 @@
 		temp_json33.put("layout", false);
 		temp_json33.put("widgets", temp_json34);
 		Map<String, Object> temp_json60 = new HashMap<>();
+		temp_json60.put("type", "button");
+		temp_json60.put("text", "検索");
 		temp_json60.put("visible", true);
 		temp_json60.put("x", 1683);
-		temp_json60.put("width", 211);
 		temp_json60.put("y", 170);
-		temp_json60.put("text", "検索");
-		temp_json60.put("type", "button");
+		temp_json60.put("width", 211);
 		temp_json60.put("height", 62);
 		Map<String, Object> temp_json61 = new HashMap<>();
+		temp_json61.put("type", "button");
+		temp_json61.put("text", "削除");
 		temp_json61.put("visible", true);
 		temp_json61.put("x", 2458);
-		temp_json61.put("width", 229);
 		temp_json61.put("y", 163);
-		temp_json61.put("text", "削除");
-		temp_json61.put("type", "button");
+		temp_json61.put("width", 229);
 		temp_json61.put("height", 70);
 		Map<String, Object> temp_json64 = new HashMap<>();
 		temp_json64.put("address2", "_");
@@ -510,41 +512,42 @@
 		temp_json64.put("businessDescription2", "_");
 		Map<String, Object> temp_json63 = new HashMap<>();
 		temp_json63.put("_", temp_json64);
-		new ArrayList<>().add("URL");
-		new ArrayList<>().add("会社概要");
-		new ArrayList<>().add("事業内容２");
-		new ArrayList<>().add("事業内容１");
-		new ArrayList<>().add("住所２");
-		new ArrayList<>().add("住所１");
-		new ArrayList<>().add("設立");
-		new ArrayList<>().add("役職");
-		new ArrayList<>().add("代表者");
+		List<String> temp_list3 = new ArrayList<>();
+		temp_list3.add("URL");
+		temp_list3.add("会社概要");
+		temp_list3.add("事業内容２");
+		temp_list3.add("事業内容１");
+		temp_list3.add("住所２");
+		temp_list3.add("住所１");
+		temp_list3.add("設立");
+		temp_list3.add("役職");
+		temp_list3.add("代表者");
 		Map<String, Object> temp_json62 = new HashMap<>();
-		temp_json62.put("visible", true);
-		temp_json62.put("data", temp_json63);
-		temp_json62.put("columns", new ArrayList<>());
-		temp_json62.put("x", 189);
-		temp_json62.put("width", 2542);
-		temp_json62.put("y", 317);
-		temp_json62.put("text", "");
 		temp_json62.put("type", "table");
-		temp_json62.put("primaryKeyName", "会社名");
+		temp_json62.put("text", "");
+		temp_json62.put("visible", true);
+		temp_json62.put("x", 189);
+		temp_json62.put("y", 317);
+		temp_json62.put("width", 2542);
 		temp_json62.put("height", 1101);
+		temp_json62.put("data", temp_json63);
+		temp_json62.put("columns", temp_list3);
+		temp_json62.put("primaryKeyName", "会社名");
 		Map<String, Object> temp_json65 = new HashMap<>();
+		temp_json65.put("type", "button");
+		temp_json65.put("text", "登録");
 		temp_json65.put("visible", true);
 		temp_json65.put("x", 1944);
-		temp_json65.put("width", 210);
 		temp_json65.put("y", 163);
-		temp_json65.put("text", "登録");
-		temp_json65.put("type", "button");
+		temp_json65.put("width", 210);
 		temp_json65.put("height", 67);
 		Map<String, Object> temp_json66 = new HashMap<>();
+		temp_json66.put("type", "button");
+		temp_json66.put("text", "編集");
 		temp_json66.put("visible", true);
 		temp_json66.put("x", 2186);
-		temp_json66.put("width", 218);
 		temp_json66.put("y", 162);
-		temp_json66.put("text", "編集");
-		temp_json66.put("type", "button");
+		temp_json66.put("width", 218);
 		temp_json66.put("height", 72);
 		Map<String, Object> temp_json59 = new HashMap<>();
 		temp_json59.put("w191cc519b2344758b8d9878328b41cd9", temp_json60);
@@ -557,188 +560,188 @@
 		temp_json58.put("layout", false);
 		temp_json58.put("widgets", temp_json59);
 		Map<String, Object> temp_json69 = new HashMap<>();
+		temp_json69.put("type", "label");
+		temp_json69.put("text", "設立");
 		temp_json69.put("visible", true);
 		temp_json69.put("x", 1984);
-		temp_json69.put("width", 96);
 		temp_json69.put("y", 304);
-		temp_json69.put("text", "設立");
-		temp_json69.put("type", "label");
+		temp_json69.put("width", 96);
 		temp_json69.put("height", 38);
 		Map<String, Object> temp_json70 = new HashMap<>();
+		temp_json70.put("type", "label");
+		temp_json70.put("text", "代表者");
 		temp_json70.put("visible", true);
 		temp_json70.put("x", 736);
-		temp_json70.put("width", 96);
 		temp_json70.put("y", 304);
-		temp_json70.put("text", "代表者");
-		temp_json70.put("type", "label");
+		temp_json70.put("width", 96);
 		temp_json70.put("height", 38);
 		Map<String, Object> temp_json71 = new HashMap<>();
+		temp_json71.put("type", "label");
+		temp_json71.put("text", "住所２");
 		temp_json71.put("visible", true);
 		temp_json71.put("x", 736);
-		temp_json71.put("width", 96);
 		temp_json71.put("y", 624);
-		temp_json71.put("text", "住所２");
-		temp_json71.put("type", "label");
+		temp_json71.put("width", 96);
 		temp_json71.put("height", 38);
 		Map<String, Object> temp_json72 = new HashMap<>();
+		temp_json72.put("type", "label");
+		temp_json72.put("text", "役職");
 		temp_json72.put("visible", true);
 		temp_json72.put("x", 1360);
-		temp_json72.put("width", 96);
 		temp_json72.put("y", 304);
-		temp_json72.put("text", "役職");
-		temp_json72.put("type", "label");
+		temp_json72.put("width", 96);
 		temp_json72.put("height", 38);
 		Map<String, Object> temp_json73 = new HashMap<>();
+		temp_json73.put("type", "textInput");
+		temp_json73.put("text", "textInput");
 		temp_json73.put("visible", true);
 		temp_json73.put("x", 736);
-		temp_json73.put("width", 560);
 		temp_json73.put("y", 672);
-		temp_json73.put("text", "textInput");
-		temp_json73.put("type", "textInput");
+		temp_json73.put("width", 560);
 		temp_json73.put("height", 128);
 		Map<String, Object> temp_json74 = new HashMap<>();
+		temp_json74.put("type", "label");
+		temp_json74.put("text", "事業内容２");
 		temp_json74.put("visible", true);
 		temp_json74.put("x", 1984);
-		temp_json74.put("width", 160);
 		temp_json74.put("y", 624);
-		temp_json74.put("text", "事業内容２");
-		temp_json74.put("type", "label");
+		temp_json74.put("width", 160);
 		temp_json74.put("height", 38);
 		Map<String, Object> temp_json75 = new HashMap<>();
+		temp_json75.put("type", "textInput");
+		temp_json75.put("text", "textInput");
 		temp_json75.put("visible", true);
 		temp_json75.put("x", 112);
-		temp_json75.put("width", 560);
 		temp_json75.put("y", 672);
-		temp_json75.put("text", "textInput");
-		temp_json75.put("type", "textInput");
+		temp_json75.put("width", 560);
 		temp_json75.put("height", 128);
 		Map<String, Object> temp_json76 = new HashMap<>();
+		temp_json76.put("type", "textInput");
+		temp_json76.put("text", "textInput");
 		temp_json76.put("visible", true);
 		temp_json76.put("x", 1984);
-		temp_json76.put("width", 560);
 		temp_json76.put("y", 672);
-		temp_json76.put("text", "textInput");
-		temp_json76.put("type", "textInput");
+		temp_json76.put("width", 560);
 		temp_json76.put("height", 128);
 		Map<String, Object> temp_json77 = new HashMap<>();
+		temp_json77.put("type", "textInput");
+		temp_json77.put("text", "textInput");
 		temp_json77.put("visible", true);
 		temp_json77.put("x", 1984);
-		temp_json77.put("width", 560);
 		temp_json77.put("y", 352);
-		temp_json77.put("text", "textInput");
-		temp_json77.put("type", "textInput");
+		temp_json77.put("width", 560);
 		temp_json77.put("height", 128);
 		Map<String, Object> temp_json78 = new HashMap<>();
+		temp_json78.put("type", "textInput");
+		temp_json78.put("text", "textInput");
 		temp_json78.put("visible", true);
 		temp_json78.put("x", 1360);
-		temp_json78.put("width", 560);
 		temp_json78.put("y", 672);
-		temp_json78.put("text", "textInput");
-		temp_json78.put("type", "textInput");
+		temp_json78.put("width", 560);
 		temp_json78.put("height", 128);
 		Map<String, Object> temp_json79 = new HashMap<>();
+		temp_json79.put("type", "label");
+		temp_json79.put("text", "住所１");
 		temp_json79.put("visible", true);
 		temp_json79.put("x", 112);
-		temp_json79.put("width", 96);
 		temp_json79.put("y", 624);
-		temp_json79.put("text", "住所１");
-		temp_json79.put("type", "label");
+		temp_json79.put("width", 96);
 		temp_json79.put("height", 38);
 		Map<String, Object> temp_json80 = new HashMap<>();
+		temp_json80.put("type", "textInput");
+		temp_json80.put("text", "textInput");
 		temp_json80.put("visible", true);
 		temp_json80.put("x", 736);
-		temp_json80.put("width", 560);
 		temp_json80.put("y", 976);
-		temp_json80.put("text", "textInput");
-		temp_json80.put("type", "textInput");
+		temp_json80.put("width", 560);
 		temp_json80.put("height", 128);
 		Map<String, Object> temp_json81 = new HashMap<>();
+		temp_json81.put("type", "label");
+		temp_json81.put("text", "URL");
 		temp_json81.put("visible", true);
 		temp_json81.put("x", 736);
-		temp_json81.put("width", 160);
 		temp_json81.put("y", 928);
-		temp_json81.put("text", "URL");
-		temp_json81.put("type", "label");
+		temp_json81.put("width", 160);
 		temp_json81.put("height", 38);
 		Map<String, Object> temp_json82 = new HashMap<>();
+		temp_json82.put("type", "label");
+		temp_json82.put("text", "会社概要");
 		temp_json82.put("visible", true);
 		temp_json82.put("x", 112);
-		temp_json82.put("width", 160);
 		temp_json82.put("y", 928);
-		temp_json82.put("text", "会社概要");
-		temp_json82.put("type", "label");
+		temp_json82.put("width", 160);
 		temp_json82.put("height", 38);
 		Map<String, Object> temp_json83 = new HashMap<>();
+		temp_json83.put("type", "label");
+		temp_json83.put("text", "会社名");
 		temp_json83.put("visible", true);
 		temp_json83.put("x", 112);
-		temp_json83.put("width", 96);
 		temp_json83.put("y", 304);
-		temp_json83.put("text", "会社名");
-		temp_json83.put("type", "label");
+		temp_json83.put("width", 96);
 		temp_json83.put("height", 38);
 		Map<String, Object> temp_json84 = new HashMap<>();
+		temp_json84.put("type", "textInput");
+		temp_json84.put("text", "textInput");
 		temp_json84.put("visible", true);
 		temp_json84.put("x", 112);
-		temp_json84.put("width", 560);
 		temp_json84.put("y", 976);
-		temp_json84.put("text", "textInput");
-		temp_json84.put("type", "textInput");
+		temp_json84.put("width", 560);
 		temp_json84.put("height", 128);
 		Map<String, Object> temp_json85 = new HashMap<>();
+		temp_json85.put("type", "label");
+		temp_json85.put("text", "事業内容１");
 		temp_json85.put("visible", true);
 		temp_json85.put("x", 1360);
-		temp_json85.put("width", 160);
 		temp_json85.put("y", 624);
-		temp_json85.put("text", "事業内容１");
-		temp_json85.put("type", "label");
+		temp_json85.put("width", 160);
 		temp_json85.put("height", 38);
 		Map<String, Object> temp_json86 = new HashMap<>();
+		temp_json86.put("type", "button");
+		temp_json86.put("text", "次へ");
 		temp_json86.put("visible", true);
 		temp_json86.put("x", 2298);
-		temp_json86.put("width", 216);
 		temp_json86.put("y", 130);
-		temp_json86.put("text", "次へ");
-		temp_json86.put("type", "button");
+		temp_json86.put("width", 216);
 		temp_json86.put("height", 110);
 		Map<String, Object> temp_json87 = new HashMap<>();
+		temp_json87.put("type", "button");
+		temp_json87.put("text", "キャンセル");
 		temp_json87.put("visible", true);
 		temp_json87.put("x", 2010);
-		temp_json87.put("width", 219);
 		temp_json87.put("y", 133);
-		temp_json87.put("text", "キャンセル");
-		temp_json87.put("type", "button");
+		temp_json87.put("width", 219);
 		temp_json87.put("height", 104);
 		Map<String, Object> temp_json88 = new HashMap<>();
+		temp_json88.put("type", "textInput");
+		temp_json88.put("text", "textInput");
 		temp_json88.put("visible", true);
 		temp_json88.put("x", 112);
-		temp_json88.put("width", 560);
 		temp_json88.put("y", 352);
-		temp_json88.put("text", "textInput");
-		temp_json88.put("type", "textInput");
+		temp_json88.put("width", 560);
 		temp_json88.put("height", 128);
 		Map<String, Object> temp_json89 = new HashMap<>();
+		temp_json89.put("type", "textInput");
+		temp_json89.put("text", "textInput");
 		temp_json89.put("visible", true);
 		temp_json89.put("x", 1360);
-		temp_json89.put("width", 560);
 		temp_json89.put("y", 352);
-		temp_json89.put("text", "textInput");
-		temp_json89.put("type", "textInput");
+		temp_json89.put("width", 560);
 		temp_json89.put("height", 128);
 		Map<String, Object> temp_json90 = new HashMap<>();
+		temp_json90.put("type", "label");
+		temp_json90.put("text", "登録画面");
 		temp_json90.put("visible", true);
 		temp_json90.put("x", 118);
-		temp_json90.put("width", 410);
 		temp_json90.put("y", 106);
-		temp_json90.put("text", "登録画面");
-		temp_json90.put("type", "label");
+		temp_json90.put("width", 410);
 		temp_json90.put("height", 128);
 		Map<String, Object> temp_json91 = new HashMap<>();
+		temp_json91.put("type", "textInput");
+		temp_json91.put("text", "textInput");
 		temp_json91.put("visible", true);
 		temp_json91.put("x", 736);
-		temp_json91.put("width", 560);
 		temp_json91.put("y", 352);
-		temp_json91.put("text", "textInput");
-		temp_json91.put("type", "textInput");
+		temp_json91.put("width", 560);
 		temp_json91.put("height", 128);
 		Map<String, Object> temp_json68 = new HashMap<>();
 		temp_json68.put("w4a9e4bb65aba4849bb8fa7f59133e8ab", temp_json69);
@@ -793,11 +796,11 @@
 	public Map<String, ScreenTemplate> getValue() {
 		return new HashMap<>(this.value);
 	}
-	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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) {
+	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result) {
 		this.presenter = presenter;
 		this.curScreen = curScreen;
 		for (ScreenTemplate screenTemplate: value.values()) {
-			screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search);
+			screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search2, search3, search5, search6, result);
 		}
 	}
 	public ScreenTemplate getScreenTemplate(String scId) {
diff --git a/src/Widget.java b/src/Widget.java
index f9098ec..52eb97f 100644
--- a/src/Widget.java
+++ b/src/Widget.java
@@ -10,6 +10,8 @@
 	private int height;
 	private int state;
 	private Map<String, Map<String, Object>> data;
+	private List<String> columns;
+	private String primaryKeyName;
 	private Widget1 widget;
 	private CurScreen curScreen;
 	private ScreenTemplates screenTemplates;
diff --git a/src/Widget1.java b/src/Widget1.java
index be3a5d0..7ddd1a4 100644
--- a/src/Widget1.java
+++ b/src/Widget1.java
@@ -10,6 +10,8 @@
 	private int height;
 	private int state;
 	private Map<String, Map<String, Object>> data;
+    private List<String> columns;
+    private String primaryKeyName;
 	private BusinessCardManagement businessCardManagement;
 	private Widget widget1;
 	private Screen screen;
@@ -35,13 +37,13 @@
 	private Businessdescription2 businessdescription2;
 	private Companyoverview companyoverview;
 	private URL URL;
-	private Search6 search6;
 	private SearchCriteriaScreen searchCriteriaScreen;
+    private Search1 search1;
+    private Search2 search2;
 	private Search3 search3;
 	private Search5 search5;
-	private Search1 search1;
+    private Search6 search6;
 	private Result result;
-	private Search2 search2;
 
 	public Widget1(String type, String text, boolean visible, int x, int y, int width, int height, int state, Map<String, Map<String, Object>> data, SwingPresenter presenter) {
         this.type = type;
@@ -344,7 +346,7 @@
 			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, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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) {
+	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result) {
         this.screen = screen;
         this.curScreen = curScreen;
         this.presenter = presenter;
@@ -369,5 +371,12 @@
         this.businessdescription2 = businessdescription2;
         this.companyoverview = companyoverview;
         this.URL = URL;
+        this.searchCriteriaScreen = searchCriteriaScreen;
+        this.search1 = search1;
+        this.search2 = search2;
+        this.search3 = search3;
+        this.search5 = search5;
+        this.search6 = search6;
+        this.result = result;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Widgets1.java b/src/Widgets1.java
index af5b4c1..451c3f9 100644
--- a/src/Widgets1.java
+++ b/src/Widgets1.java
@@ -36,11 +36,11 @@
 	public Widget1 getWidget1(String wid) {
 		return this.value.get(wid);
 	}
-	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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) {
+	public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, 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, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search, Search3 search3, Search5 search5, Search6 search6, Result result) {
 		this.curScreen = curScreen;
 		this.presenter = presenter;
 		for (Widget1 widget: value.values()) {
-			widget.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search);
+			widget.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search, search3, search5, search6, result);
 		}
 	}
 }
\ No newline at end of file