diff --git a/bin/application/Main.class b/bin/application/Main.class
index 851d532..243760e 100644
Binary files a/bin/application/Main.class and b/bin/application/Main.class differ
diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class
index 6fecc13..80863b2 100644
Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ
diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class
index be0676a..cd35cde 100644
Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ
diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class
index 2033a34..4a904f3 100644
Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ
diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class
index 84e0020..2efd632 100644
Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ
diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class
index ed60179..2bb3b59 100644
Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ
diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class
index 2e8e9a7..89dff7d 100644
Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ
diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class
index 6fa9dd4..5436c8c 100644
Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ
diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class
index 33b86b5..2a6215f 100644
Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ
diff --git a/bin/application/dbController.class b/bin/application/dbController.class
index f296110..966d505 100644
Binary files a/bin/application/dbController.class and b/bin/application/dbController.class differ
diff --git a/bin/application/playGame.class b/bin/application/playGame.class
index ad3ea26..65c81c2 100644
Binary files a/bin/application/playGame.class and b/bin/application/playGame.class differ
diff --git a/bin/application/uiDataType.class b/bin/application/uiDataType.class
new file mode 100644
index 0000000..02c14ce
Binary files /dev/null and b/bin/application/uiDataType.class differ
diff --git a/src/application/Main.java b/src/application/Main.java
index cf25795..59c682c 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -1,3 +1,24 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * 
+ */
 package application;
 	
 import java.io.File;
@@ -105,6 +126,7 @@ public class Main extends Application {
 			//loading settings and initialize UI
 			mainWindowController.loadSettings();
 			mainWindowController.dbController.main();
+			mainWindowController.addUIData();
 			mainWindowController.initActions();
 			mainWindowController.initUI();
 			
diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index 73b4d21..2bb19aa 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -1,3 +1,24 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * 
+ */
 package application;
 
 import java.awt.Graphics2D;
@@ -12,7 +33,6 @@ import java.math.BigInteger;
 import java.sql.SQLException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Optional;
 import java.util.Properties;
 import javax.imageio.ImageIO;
@@ -28,6 +48,8 @@ import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition;
 import javafx.animation.FadeTransition;
 import javafx.animation.ParallelTransition;
 import javafx.animation.TranslateTransition;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -133,6 +155,7 @@ public class MainWindowController {
     private int xPos = -200;
     private int yPos = 17;
     private int xPosHelper;
+    private int selectedUIDataIndex;
 	private FileChooser fileChooser = new FileChooser();
 	private DirectoryChooser directoryChooser = new DirectoryChooser();
 	private File dirWin = new File(System.getProperty("user.home") + "/Documents/cemu_UI");
@@ -141,9 +164,7 @@ public class MainWindowController {
 	private File fileLinux = new File(dirLinux + "/config.xml");
 	File pictureCacheWin = new File(dirWin+"/picture_cache");
 	File pictureCacheLinux = new File(dirLinux+"/picture_cache");
-	private ArrayList<JFXButton> gameCover = new ArrayList<JFXButton>();
-	private ArrayList<Label> gameLabel = new ArrayList<Label>();
-	private ArrayList<VBox> gameVBox = new ArrayList<VBox>();
+	private ObservableList<uiDataType> games = FXCollections.observableArrayList();
     Properties props = new Properties();
     Properties gameProps = new Properties();
     private MenuItem edit = new MenuItem("edit");
@@ -151,7 +172,6 @@ public class MainWindowController {
     private MenuItem update = new MenuItem("update");
     private MenuItem addDLC = new MenuItem("add DLC");
 	private ContextMenu gameContextMenu = new ContextMenu(edit, remove, update, addDLC);
-	private MouseEvent selectedEvent;
 	private Label lastGameLabel = new Label();
 	
 	private ImageView add_circle_black = new ImageView(new Image("recources/icons/ic_add_circle_black_24dp_1x.png"));
@@ -237,8 +257,6 @@ public class MainWindowController {
                 	alert.showAndWait();
             	}
             	else{
-            		int i = gameCover.indexOf((selectedEvent).getSource());
-            		
             		Alert alert = new Alert(AlertType.CONFIRMATION);
                 	alert.setTitle("remove");
                 	alert.setHeaderText("cemu_UI");
@@ -248,29 +266,29 @@ public class MainWindowController {
                 	Optional<ButtonType> result = alert.showAndWait();
         			if (result.get() == ButtonType.OK){
     					try {
-    						gameVBox.remove(i);
-        					gameCover.remove(i);
-        					gameLabel.remove(i);
+    						//remove all elements from gamesAnchorPane
+	    					for(int i=0; i< games.size(); i++){
+	    						gamesAnchorPane.getChildren().remove(games.get(i).getVBox());
+	    					}
+	    					//remove game from database
+    						games.remove(selectedUIDataIndex);
 							dbController.removeRom(selectedGameTitleID);
-	    					gamesAnchorPane.getChildren().remove(i);
-	    					
-	    					//TODO remove if animations are done
-	    					Runtime.getRuntime().exec("java -jar cemu_UI.jar");	//start again (preventing Bugs)
-	    					System.exit(0);	//finishes itself
-	    					
-						} catch (SQLException | IOException e) {
+	    					gamesAnchorPane.getChildren().removeAll(games);
+	    					//reset position
+	    				    xPos = -200;
+	    				    yPos = 17;
+	    				    xPosHelper = 0;
+	    					//add all games to gamesAnchorPane
+	    					for(int i=0; i< games.size(); i++){
+	    				    	generatePosition();
+	    				    	games.get(i).getVBox().setLayoutX(getxPos());
+	    				    	games.get(i).getVBox().setLayoutY(getyPos());
+	    						gamesAnchorPane.getChildren().add(games.get(i).getVBox());
+	    					}
+						} catch (Exception e) {
 							e.printStackTrace();
 						}
         			}
-            		
-					//TODO nachrück animation
-//					platz(i)/4 -> aufrunden = Reihe; plath(i)-(platz(i)/4 -> abrunden*4)
-//					jetzt haben wir den platz des gelöschten elements und lönnen alle nachfolgenden nachrücken
-//        			double a = 13;
-//            		double b = 4;
-//            		a = a/b;
-//            		System.out.println(Math.ceil(a)); //aufrunden
-//            		System.out.println(Math.floor(a));	//abrunden
             	}
             }
 		});
@@ -643,11 +661,13 @@ public class MainWindowController {
     	Image coverImage = new Image(coverFile.toURI().toString());
     	
     	generatePosition();
-    	gameVBox.add(VBox);
-    	gameCover.add(gameBtn);
-    	gameLabel.add(gameTitleLabel);
+
+    	VBox.setLayoutX(getxPos());
+    	VBox.setLayoutY(getyPos());
+    	VBox.getChildren().addAll(gameTitleLabel,gameBtn);	
     	gameTitleLabel.setMaxWidth(200);
     	gameTitleLabel.setPadding(new Insets(0,0,0,8));
+    	gameTitleLabel.setFont(Font.font("System", FontWeight.BOLD, 14));
     	imageView.setImage(coverImage);
     	imageView.setFitHeight(300);
     	imageView.setFitWidth(200);
@@ -659,27 +679,33 @@ public class MainWindowController {
 		     public void handle(MouseEvent event) {
             	System.out.println("selected: "+title+"; ID: "+titleID);
             	
+            	for(int i=0; i<games.size(); i++){
+            		if(games.get(i).getButton() == event.getSource()){
+            			selectedUIDataIndex = i;
+            		}
+            	}
+            	
             	gameExecutePath = romPath;
             	selectedGameTitleID = titleID;
             	selectedGameTitle = title;
-            	selectedEvent = event;
             	
             	lastGameLabel.setStyle("-fx-underline: false;");
-            	gameLabel.get(gameCover.indexOf(event.getSource())).setStyle("-fx-underline: true;");
-            	lastGameLabel = gameLabel.get(gameCover.indexOf(event.getSource()));
-            	
+            	games.get(selectedUIDataIndex).getLabel().setStyle("-fx-underline: true;");
+            	lastGameLabel = games.get(selectedUIDataIndex).getLabel();
+
             	if(dbController.getLastPlayed(titleID).equals("") || dbController.getLastPlayed(titleID).equals(null)){
             		lastTimePlayedBtn.setText("Last played, never");
             		timePlayedBtn.setText(dbController.getTimePlayed(titleID)+ " min");
             	}else{
                 	DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 	
-                	int localInt = Integer.parseInt(dtf.format(LocalDate.now()).replaceAll("-", ""));
-                	int lastInt = Integer.parseInt(dbController.getLastPlayed(titleID).replaceAll("-", ""));
+                	int today = Integer.parseInt(dtf.format(LocalDate.now()).replaceAll("-", ""));
+                	int yesterday  = Integer.parseInt(dtf.format(LocalDate.now().minusDays(1)).replaceAll("-", ""));
+                	int lastday = Integer.parseInt(dbController.getLastPlayed(titleID).replaceAll("-", ""));
                 	
-                	if(localInt == lastInt){
+                	if(today == lastday){
                 		lastTimePlayedBtn.setText("Last played, today");
-                	}else if(localInt-1 == lastInt){
+                	}else if(yesterday == lastday){
                 		lastTimePlayedBtn.setText("Last played, yesterday");
                 	}else{
                     	lastTimePlayedBtn.setText("Last played, "+dbController.getLastPlayed(titleID));
@@ -698,12 +724,14 @@ public class MainWindowController {
             	}
             }	
         });
-    	
-    	gameTitleLabel.setFont(Font.font("System", FontWeight.BOLD, 14));
-    	VBox.getChildren().addAll(gameTitleLabel,gameBtn);
-    	VBox.setLayoutX(getxPos());
-    	VBox.setLayoutY(getyPos());
-    	gamesAnchorPane.getChildren().add(VBox);
+
+    	games.add(new uiDataType(VBox, gameTitleLabel, gameBtn, titleID, romPath));
+    }
+    
+    void addUIData(){
+    	for(int i=0; i<games.size(); i++){
+    		gamesAnchorPane.getChildren().add(games.get(i).getVBox());
+    	}
     }
 
     
@@ -765,8 +793,8 @@ public class MainWindowController {
 			menuHam.getStyleClass().add("jfx-hamburgerB");
 		}
 
-		for(int i=0; i<gameCover.size(); i++){
-			gameCover.get(i).setRipplerFill(Paint.valueOf(getColor()));
+		for(int i=0; i<games.size(); i++){
+			games.get(i).getButton().setRipplerFill(Paint.valueOf(getColor()));
 		}
     }
 		
diff --git a/src/application/dbController.java b/src/application/dbController.java
index 996c6c8..6bcf98c 100644
--- a/src/application/dbController.java
+++ b/src/application/dbController.java
@@ -1,3 +1,24 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * 
+ */
 package application;
 
 import java.awt.Graphics2D;
diff --git a/src/application/playGame.java b/src/application/playGame.java
index 8cfdf14..105f4a0 100644
--- a/src/application/playGame.java
+++ b/src/application/playGame.java
@@ -40,7 +40,13 @@ public class playGame extends Thread{
     		
     		dbController.setTimePlayed(Integer.toString(timePlayed), selectedGameTitleID);
     		Platform.runLater(() -> {
-        		mainWindowController.timePlayedBtn.setText(dbController.getTimePlayed(selectedGameTitleID)+ " min");
+    			if(Integer.parseInt(dbController.getTimePlayed(selectedGameTitleID)) > 60){
+            		int hoursPlayed = (int) Math.floor(Integer.parseInt(dbController.getTimePlayed(selectedGameTitleID))/60);
+            		int minutesPlayed = Integer.parseInt(dbController.getTimePlayed(selectedGameTitleID))-60*hoursPlayed;
+            		mainWindowController.timePlayedBtn.setText(hoursPlayed+"h "+minutesPlayed+"min");
+            	}else{
+            		mainWindowController.timePlayedBtn.setText(dbController.getTimePlayed(selectedGameTitleID)+ " min");
+            	}
         		mainWindowController.main.primaryStage.setIconified(false);
              });
 		}catch (IOException | InterruptedException e){
diff --git a/src/application/uiDataType.java b/src/application/uiDataType.java
new file mode 100644
index 0000000..a8dd24c
--- /dev/null
+++ b/src/application/uiDataType.java
@@ -0,0 +1,87 @@
+package application;
+
+import com.jfoenix.controls.JFXButton;
+
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+public class uiDataType {
+	
+	private final SimpleObjectProperty<VBox> vBox = new SimpleObjectProperty<>();
+	private final SimpleObjectProperty<Label> label = new SimpleObjectProperty<>();
+	private final SimpleObjectProperty<JFXButton> button = new SimpleObjectProperty<>();
+	private final StringProperty titleID = new SimpleStringProperty();
+	private final StringProperty romPath = new SimpleStringProperty();
+	
+	public uiDataType (final VBox vBox, final Label label, final JFXButton button, final String titleID, final String romPath){
+		this.vBox.set(vBox);
+		this.label.set(label);
+		this.button.set(button);
+		this.titleID.set(titleID);
+	}
+	
+	public SimpleObjectProperty<VBox> vBoxProperty(){
+		return vBox;
+	}
+	
+	public SimpleObjectProperty<Label> labelProperty(){
+		return label;
+	}
+	
+	public SimpleObjectProperty<JFXButton> buttonProperty(){
+		return button;
+	}
+	
+	public StringProperty titleIDProperty(){
+		return titleID;
+	}
+	
+	public StringProperty romPathProperty(){
+		return romPath;
+	}
+	
+	
+	public final VBox getVBox() {
+		return vBoxProperty().get();
+	}
+	
+	public final Label getLabel() {
+		return labelProperty().get();
+	}
+	
+	public final JFXButton getButton() {
+		return buttonProperty().get();
+	}
+	
+	public final String getTitleID(){
+		return titleIDProperty().get();
+	}
+	
+	public final String getRomPath(){
+		return romPathProperty().get();
+	}
+	
+	
+	public final void setVBox(VBox vBox) {
+		vBoxProperty().set(vBox);
+	}
+	
+	public final void setLabel(Label label) {
+		labelProperty().set(label);
+	}
+	
+	public final void setButton(JFXButton button) {
+		buttonProperty().set(button);
+	}
+	
+	public final void setTitleID(String titleID){
+		titleIDProperty().set(titleID);
+	}
+	
+	public final void setRomPath(String romPath){
+		romPathProperty().set(romPath);
+	}
+}