diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java b/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
index cc3322caac9367190611e0d59ba08717c9cf3a1c..da9d6161628f4fb97f76008167c3c90edd16665e 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
@@ -157,9 +157,9 @@ public class NewPaymentController extends BaseController implements Styleable
 				tagField.setAllTags(serverTagConnection.getTags());
 			}
 			catch(Exception e)
-			{
-				//ERRORHANDLING
+			{				
 				Logger.error(e);
+				controller.showConnectionErrorAlert(ExceptionHandler.getMessageForException(e));
 			}
 		}
 		
@@ -323,66 +323,50 @@ public class NewPaymentController extends BaseController implements Styleable
 			}	
 		}		
 		catch(Exception e)
-		{
-			//ERRORHANDLING
+		{			
 			Logger.error(e);
+			controller.showConnectionErrorAlert(ExceptionHandler.getMessageForException(e));
 		}
 	}
+	
+	private void showWarning(String message)
+	{
+		AlertGenerator.showAlert(AlertType.WARNING,
+				                Localization.getString(Strings.TITLE_WARNING),
+				                "", 
+				                message, 
+				                controller.getIcon(), 
+				                controller.getStage(), 
+				                null, 
+				                false);
+	}
 
 	public void save()
 	{
 		String name = textFieldName.getText();
 		if(name == null || name.equals(""))
 		{
-			AlertGenerator.showAlert(AlertType.WARNING,
-			                        Localization.getString(Strings.TITLE_WARNING),
-			                        "", 
-			                        Localization.getString(Strings.WARNING_EMPTY_PAYMENT_NAME), 
-			                        controller.getIcon(), 
-			                        controller.getStage(), 
-			                        null, 
-			                        false);
+			showWarning(Localization.getString(Strings.WARNING_EMPTY_PAYMENT_NAME));			
 			return;
 		}
 		
 		if(name.length() > 150)
 		{
-			AlertGenerator.showAlert(AlertType.WARNING,
-			                        Localization.getString(Strings.TITLE_WARNING),
-			                        "", 
-			                        Localization.getString(Strings.WARNING_NAME_CHARACTER_LIMIT_REACHED_150), 
-			                        controller.getIcon(), 
-			                        controller.getStage(), 
-			                        null, 
-			                        false);
+			showWarning(Localization.getString(Strings.WARNING_NAME_CHARACTER_LIMIT_REACHED_150));			
 			return;
 		}
 
 		String amountText = textFieldAmount.getText();
 		if(!amountText.matches("^-?\\d+(,\\d+)*(\\.\\d+(e\\d+)?)?$"))
 		{
-			AlertGenerator.showAlert(AlertType.WARNING, 
-			                        Localization.getString(Strings.TITLE_WARNING),
-			                        "",
-			                        Localization.getString(Strings.WARNING_PAYMENT_AMOUNT),
-			                        controller.getIcon(),
-			                        controller.getStage(),
-			                        null,
-			                        false);
+			showWarning(Localization.getString(Strings.WARNING_PAYMENT_AMOUNT));
 			return;
 		}
 
 		LocalDate date = datePicker.getValue();
 		if(date == null)
 		{
-			AlertGenerator.showAlert(AlertType.WARNING,
-                			        Localization.getString(Strings.TITLE_WARNING),
-                			        "",
-                			        Localization.getString(Strings.WARNING_EMPTY_PAYMENT_DATE),
-                			        controller.getIcon(),
-                			        controller.getStage(),
-                			        null,
-                			        false);
+			showWarning(Localization.getString(Strings.WARNING_EMPTY_PAYMENT_DATE));
 			return;
 		}
 
@@ -398,14 +382,7 @@ public class NewPaymentController extends BaseController implements Styleable
 		{
 			if(description.length() > 150)
 			{
-				AlertGenerator.showAlert(AlertType.WARNING,
-				                        Localization.getString(Strings.TITLE_WARNING),
-				                        "",
-				                        Localization.getString(Strings.WARNING_DESCRIPTION_CHARACTER_LIMIT_REACHED_150),
-				                        controller.getIcon(),
-				                        controller.getStage(),
-				                        null,
-				                        false);
+				showWarning(Localization.getString(Strings.WARNING_DESCRIPTION_CHARACTER_LIMIT_REACHED_150));				
 				return;
 			}
 		}
@@ -429,27 +406,13 @@ public class NewPaymentController extends BaseController implements Styleable
 
 			if(repeatingInterval == 0 && repeatingDay == 0)
 			{
-				AlertGenerator.showAlert(AlertType.WARNING,
-				        Localization.getString(Strings.TITLE_WARNING),
-				        "",
-				        Localization.getString(Strings.WARNING_PAYMENT_REPEATING),				       
-				        controller.getIcon(),
-				        controller.getStage(),
-				        null,
-				        false);
+				showWarning(Localization.getString(Strings.WARNING_PAYMENT_REPEATING));
 				return;
 			}
 
 			if(datePickerEnddate.getValue() != null && datePickerEnddate.getValue().isBefore(date))
 			{
-				AlertGenerator.showAlert(AlertType.WARNING, 
-				                        Localization.getString(Strings.TITLE_WARNING),
-				                        "",
-				                        Localization.getString(Strings.WARNING_ENDDATE_BEFORE_STARTDATE),
-				                        controller.getIcon(),
-				                        controller.getStage(),
-				                        null,
-				                        false);
+				showWarning(Localization.getString(Strings.WARNING_ENDDATE_BEFORE_STARTDATE));				
 				return;
 			}			
 
diff --git a/src/de/deadlocker8/budgetmaster/ui/fxml/NewPaymentGUI.fxml b/src/de/deadlocker8/budgetmaster/ui/fxml/NewPaymentGUI.fxml
index f721906472dce797c48de71e5c902e55f8509683..baf57e5d63a86a1ae331e5529de5e50bb198ff8d 100644
--- a/src/de/deadlocker8/budgetmaster/ui/fxml/NewPaymentGUI.fxml
+++ b/src/de/deadlocker8/budgetmaster/ui/fxml/NewPaymentGUI.fxml
@@ -21,7 +21,7 @@
    <children>
       <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
          <content>
-            <VBox fx:id="vboxContent" prefHeight="544.0" prefWidth="414.0" spacing="20.0">
+            <VBox fx:id="vboxContent" prefHeight="544.0" prefWidth="414.0" spacing="15.0">
                <children>
                   <HBox alignment="CENTER_LEFT" prefHeight="30.0" prefWidth="465.0">
                      <children>
@@ -105,7 +105,7 @@
                         <TextArea fx:id="textArea" maxWidth="1.7976931348623157E308" prefHeight="37.0" prefWidth="240.0" HBox.hgrow="ALWAYS" />
                      </children>
                   </HBox>
-                  <HBox alignment="CENTER_LEFT" prefHeight="30.0" prefWidth="465.0">
+                  <HBox prefHeight="30.0" prefWidth="465.0">
                      <children>
                         <Label prefHeight="29.0" prefWidth="125.0" text="%payment.new.label.tags">
                            <font>
diff --git a/src/de/deadlocker8/budgetmaster/ui/tagField/TagField.java b/src/de/deadlocker8/budgetmaster/ui/tagField/TagField.java
index a938861a0741d50680bb9e1072ff7cc170e94906..d0fcef1083d25a5a9687ed65a4ae88b59b04d528 100644
--- a/src/de/deadlocker8/budgetmaster/ui/tagField/TagField.java
+++ b/src/de/deadlocker8/budgetmaster/ui/tagField/TagField.java
@@ -59,6 +59,7 @@ public class TagField extends VBox
 	{
 		FlowPane flowPane = new FlowPane();
 		flowPane.setVgap(5);
+		flowPane.setMinHeight(20);
 		flowPane.setHgap(5);
 		flowPane.setPadding(new Insets(5));
 		return flowPane;