diff --git a/build/BudgetMaster.exe b/build/BudgetMaster.exe
index c1d58aab51407c126a005680e880a19fd53ca44e..d00d1e2405d270b1dc0d1012743fe45fcfdc1188 100644
Binary files a/build/BudgetMaster.exe and b/build/BudgetMaster.exe differ
diff --git a/build/BudgetMasterClient.jar b/build/BudgetMasterClient.jar
index 1995d5a80db64afbfaaa3188f819e37f744fd51b..d7044bc822703f374d7b34a7b33082ad932f96f0 100644
Binary files a/build/BudgetMasterClient.jar and b/build/BudgetMasterClient.jar differ
diff --git a/build/BudgetMasterServer.jar b/build/BudgetMasterServer.jar
index 51080ca943c094af3655c71eb638ac43c2f63aac..78f8a39be4b9aa71bfe1a8fd5b35a37419b8ef19 100644
Binary files a/build/BudgetMasterServer.jar and b/build/BudgetMasterServer.jar differ
diff --git a/src/de/deadlocker8/budgetmaster/ui/HomeController.java b/src/de/deadlocker8/budgetmaster/ui/HomeController.java
index 8ea67bf5d0e9a8c398005a3f16311e5cbaafec1e..6035ff1ea0fe95add2391f1745baada876f0d366 100644
--- a/src/de/deadlocker8/budgetmaster/ui/HomeController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/HomeController.java
@@ -2,8 +2,6 @@ package de.deadlocker8.budgetmaster.ui;
 
 import java.util.ArrayList;
 
-import org.joda.time.DateTime;
-
 import de.deadlocker8.budgetmaster.logic.Budget;
 import de.deadlocker8.budgetmaster.logic.CategoryBudget;
 import de.deadlocker8.budgetmaster.logic.Helpers;
@@ -84,6 +82,10 @@ public class HomeController implements Refreshable
 			{
 				labelBudget.setStyle("-fx-text-fill: #CC0000");
 			}
+			else
+			{
+				labelBudget.setStyle("-fx-text-fill: #000000");
+			}
 			labelStartBudget.setText("von " + String.valueOf(Helpers.NUMBER_FORMAT.format(budget.getIncomeSum()).replace(".", ",")) + " " + controller.getSettings().getCurrency() + " verbleibend");
 			
 			double factor = remaining / budget.getIncomeSum();
@@ -106,15 +108,7 @@ public class HomeController implements Refreshable
 		refreshListView();	
 		refreshCounter();
 		
-		Label labelPlaceholder;
-		if(controller.getCurrentDate().isAfter(DateTime.now()))
-		{
-			labelPlaceholder = new Label("Datum liegt in der Zukunft");			
-		}
-		else
-		{
-			labelPlaceholder = new Label("Keine Daten verfügbar");			
-		}
+		Label labelPlaceholder = new Label("Keine Daten verfügbar");			
 		labelPlaceholder.setStyle("-fx-font-size: 16");
 		listView.setPlaceholder(labelPlaceholder);
 	}
diff --git a/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java b/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
index deff361fd8fbdc384095fea72ce4cd59b9a87efd..18e088e049e55be396bf14ed06a6c66f1d1926de 100644
--- a/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
@@ -164,10 +164,6 @@ public class NewPaymentController
 				}
 			}
 		});
-		//preselect correct month and year
-		DateTime currentDate = controller.getCurrentDate();
-		datePicker.setValue(LocalDate.now().withYear(currentDate.getYear()).withMonth(currentDate.getMonthOfYear()).withDayOfMonth(currentDate.getDayOfMonth()));
-		Platform.runLater(()->{datePicker.getEditor().clear();});
 		
 		if(edit)
 		{
@@ -214,7 +210,12 @@ public class NewPaymentController
 			comboBoxCategory.getSelectionModel().select(0);
 			checkBoxRepeat.setSelected(false);
 			radioButtonPeriod.setSelected(true);
-			toggleRepeatingArea(false);
+			toggleRepeatingArea(false);			
+
+			//preselect correct month and year
+			DateTime currentDate = controller.getCurrentDate();
+			datePicker.setValue(LocalDate.now().withYear(currentDate.getYear()).withMonth(currentDate.getMonthOfYear()).withDayOfMonth(currentDate.getDayOfMonth()));
+			Platform.runLater(()->{datePicker.getEditor().clear();});
 		}
 	}