diff --git a/src/ScreenTemplate.java b/src/ScreenTemplate.java
index 68f0863..c17d1b4 100644
--- a/src/ScreenTemplate.java
+++ b/src/ScreenTemplate.java
@@ -5,6 +5,8 @@
 	private boolean layout;
 	private String screenId;
 	private CurScreen curScreen;
+	private SwingPresenter presenter;
+
 	public Map<String, Object> getValue() {
 		Map temp_nil1 = new HashMap<>();
 		temp_nil1.put("widgets",this.widgets.getValue());
@@ -26,10 +28,12 @@
 	public String getScreenId() {
 		return this.screenId;
 	}
-	public ScreenTemplate(SwingPresenter presenter) {
-		this.widgets = new Widgets1(presenter);
+	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) {
+		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);
 	}
 }
\ No newline at end of file
diff --git a/src/Widget1.java b/src/Widget1.java
index a7a480b..be3a5d0 100644
--- a/src/Widget1.java
+++ b/src/Widget1.java
@@ -346,9 +346,9 @@
 	}
 	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) {
         this.screen = screen;
+        this.curScreen = curScreen;
         this.presenter = presenter;
         this.businessCardManagement = businessCardManagement;
-		this.curScreen = curScreen;
         this.editcompany = editcompany;
         this.editaddress1 = editaddress1;
         this.editbusiness1 = editbusiness1;
diff --git a/src/Widgets1.java b/src/Widgets1.java
index 799da9b..af5b4c1 100644
--- a/src/Widgets1.java
+++ b/src/Widgets1.java
@@ -4,9 +4,6 @@
 	private Map<String, Widget1> value = new HashMap<>();
 	private CurScreen curScreen;
 	private SwingPresenter presenter;
-	public Widgets1(SwingPresenter presenter) {
-		this.presenter = presenter;
-	}
 	public Map<String, Object> getValue() {
 		Map<String, Object> value = new HashMap<>();
 		for (String key: this.value.keySet()) {
@@ -41,6 +38,7 @@
 	}
 	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) {
 		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);
 		}