diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 3a21537..a698e59 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
diff --git a/bin/.gitignore b/bin/.gitignore
index 94b23b3..b42b859 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,3 +1 @@
 /application/
-/datatypes/
-/resources/
diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class
index dfcab11..d450515 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 41334f6..1a96310 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 5f1d56a..ba2445f 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 c2a6a71..b111c57 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 f565140..9492da4 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 e1366ea..66733a3 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 f7f8c11..107e4cf 100644
Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ
diff --git a/bin/resources/icons/close_black_2048x2048.png b/bin/resources/icons/close_black_2048x2048.png
new file mode 100644
index 0000000..2d0397b
Binary files /dev/null and b/bin/resources/icons/close_black_2048x2048.png differ
diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index 299eb87..5db081a 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -329,7 +329,8 @@ public class MainWindowController {
 		});
 		
 		remove.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
+			@SuppressWarnings("unlikely-arg-type")	//FIXME SuppressWarnings("unlikely-arg-type")
+			@Override
             public void handle(ActionEvent event) {
             	System.out.println("remove "+selectedGameTitleID);
             	if(selectedGameTitleID == null){
@@ -359,12 +360,13 @@ public class MainWindowController {
 	    					//remove game from database
     						games.remove(selectedUIDataIndex);
 							dbController.removeRom(selectedGameTitleID);
+							//remove all games form gamesAnchorPane (UI)
 	    					gamesAnchorPane.getChildren().removeAll(games);
 	    					//reset position
 	    				    xPos = -200;
 	    				    yPos = 17;
 	    				    xPosHelper = 0;
-	    					//add all games to gamesAnchorPane
+	    					//add all games to gamesAnchorPane (UI)
 	    					for(int i=0; i< games.size(); i++){
 	    				    	generatePosition();
 	    				    	games.get(i).getVBox().setLayoutX(getxPos());