diff --git a/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
index 434a17a2577ee8aee5a27b1a2850134362e350d0..e6a6a6aa5d3748b2cc348230870c16ac1f5e263b 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
@@ -10,7 +10,7 @@ import javafx.beans.property.StringProperty;
 
 public class TriggerDisplayable implements Displayable {
 
-	private Trigger trigger;
+	private final Trigger trigger;
 
 	public TriggerDisplayable(Trigger trigger) {
 		this.trigger = trigger;
@@ -21,7 +21,7 @@ public class TriggerDisplayable implements Displayable {
 		return trigger;
 	}
 
-	private StringProperty displayable = new SimpleStringProperty();
+	private final StringProperty displayable = new SimpleStringProperty();
 
 	@Override
 	public StringProperty displayProperty() {
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
index a5d2f0ea9780c898b90e1ebd98efff2c60d19653..854bcf6a2be17653929e22e6a8a5ef125c066bd6 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
@@ -25,9 +25,9 @@ public class CartTriggerViewController extends NVC {
 	@FXML
 	private CheckBox allCartsCheckbox;
 
-	private ProjectPreviewView projectPreviewView;
+	private final ProjectPreviewView projectPreviewView;
 
-	private CartTriggerItem item;
+	private final CartTriggerItem item;
 
 	public CartTriggerViewController(CartTriggerItem item) {
 		load("view/option/pad/trigger", "CartTrigger", Localization.getBundle());
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
index 77d5166b7191a5da2d5f2565bd1221da47e830b4..4e79c66990bb5cd099a81b4fc5fb2e4a3bb87f0c 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
@@ -26,14 +26,15 @@ public class TriggerPointViewController extends NVC {
 	@FXML
 	private HBox buttonBox;
 
-	private TriggerDisplayable triggerWrapper;
+	private final TriggerDisplayable triggerWrapper;
 
 	public TriggerPointViewController(TriggerDisplayable triggerWrapper) {
 		load("view/option/pad/trigger", "TriggerPoint", Localization.getBundle());
 		this.triggerWrapper = triggerWrapper;
 
-		for (TriggerItem item : triggerWrapper.getTrigger().getItems())
+		for (TriggerItem item : triggerWrapper.getTrigger().getItems()) {
 			showTriggerItem(item);
+		}
 	}
 
 	@Override
@@ -42,14 +43,14 @@ public class TriggerPointViewController extends NVC {
 		types.stream().sorted().forEach(item ->
 		{
 			try {
-				TriggerItemFactory conntect = PlayPadPlugin.getRegistries().getTriggerItems().getFactory(item);
-				Button button = new Button(conntect.toString(), new FontIcon(FontAwesomeType.PLUS_CIRCLE));
+				TriggerItemFactory factory = PlayPadPlugin.getRegistries().getTriggerItems().getFactory(item);
+				Button button = new Button(factory.toString(), new FontIcon(FontAwesomeType.PLUS_CIRCLE));
 				button.setContentDisplay(ContentDisplay.TOP);
 				button.setPrefWidth(150);
 
 				button.setOnAction(e ->
 				{
-					TriggerItem triggerItem = conntect.newInstance(triggerWrapper.getTrigger());
+					TriggerItem triggerItem = factory.newInstance(triggerWrapper.getTrigger());
 
 					triggerWrapper.addItem(triggerItem);
 					showTriggerItem(triggerItem);
@@ -70,8 +71,10 @@ public class TriggerPointViewController extends NVC {
 			if (controller != null) {
 				itemBox.getChildren().add(controller.getParent());
 
-				NVC timeViewController = new TriggerTimeViewController(item);
-				itemBox.getChildren().add(timeViewController.getParent());
+				if (triggerWrapper.getTrigger().getTriggerPoint().isTimeAppendable()) {
+					final NVC timeViewController = new TriggerTimeViewController(item);
+					itemBox.getChildren().add(timeViewController.getParent());
+				}
 
 				Button deleteButton = new Button("", new FontIcon(FontAwesomeType.TRASH));
 				HBox hbox = new HBox(itemBox, deleteButton);