From 86aa078f10f67ce15a722422214dd4d6f24832b2 Mon Sep 17 00:00:00 2001
From: axel1200 <alexander.von.trostorff@gmail.com>
Date: Sun, 26 Nov 2017 14:30:48 +0100
Subject: [PATCH 01/14] Removed minheight in constraints, they caused unwanted
 behaviour with textfields, anyway they were not needed

---
 .../com/faforever/moderatorclient/ui/LoginController.java | 2 ++
 src/main/resources/ui/login.fxml                          | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/faforever/moderatorclient/ui/LoginController.java b/src/main/java/com/faforever/moderatorclient/ui/LoginController.java
index d2a4247..088b50b 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/LoginController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/LoginController.java
@@ -22,6 +22,7 @@ public class LoginController implements Controller<Pane> {
 
     public LoginController(FafApiCommunicationService fafApiCommunicationService) {
         this.fafApiCommunicationService = fafApiCommunicationService;
+
     }
 
     @Override
@@ -31,6 +32,7 @@ public Pane getRoot() {
 
     @FXML
     public void initialize() {
+        errorMessageLabel.managedProperty().bind(errorMessageLabel.visibleProperty());
         errorMessageLabel.setVisible(false);
     }
 
diff --git a/src/main/resources/ui/login.fxml b/src/main/resources/ui/login.fxml
index 15ae24f..949d8e7 100644
--- a/src/main/resources/ui/login.fxml
+++ b/src/main/resources/ui/login.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" minWidth="465.0" xmlns="http://javafx.com/javafx/8.0.111"
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" minWidth="465.0" xmlns="http://javafx.com/javafx/8.0.121"
             fx:controller="com.faforever.moderatorclient.ui.LoginController">
     <content>
         <GridPane hgap="5.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" vgap="5.0">
@@ -15,11 +15,7 @@
                 <ColumnConstraints hgrow="SOMETIMES" maxWidth="200.0" minWidth="200.0" prefWidth="200.0"/>
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="30"/>
             </rowConstraints>
             <children>
                 <Label text="Username" GridPane.rowIndex="1"/>

From 6265401bbc988efe37bf6a5e18c51a3d57c125f3 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Sat, 25 Nov 2017 00:38:19 +0100
Subject: [PATCH 02/14] add map vault + hide&rank mapVersions fixes #22 fixes
 #21

---
 pom.xml                                       |  40 ++++
 .../api/dto/AbstractEntity.java               |   2 +
 .../moderatorclient/api/dto/Map.java          |   3 +
 .../moderatorclient/api/dto/MapVersion.java   |  17 +-
 .../moderatorclient/api/dto/Player.java       |  10 +-
 .../api/rest/ElideRouteBuilder.java           |  14 ++
 .../api/rest/FafApiCommunicationService.java  |   9 +
 .../api/rest/domain/MapService.java           |  58 ++++-
 .../api/rest/domain/UserService.java          |   6 +-
 .../moderatorclient/config/JsonApiConfig.java |   2 +
 .../CycleAvoidingMappingContext.java          |  54 +++++
 .../mapstruct/JavaFXMapper.java               |  47 ++++
 .../moderatorclient/mapstruct/MapMapper.java  |  30 +++
 .../mapstruct/MapVersionMapper.java           |  21 ++
 .../mapstruct/PlayerMapper.java               |  16 ++
 .../moderatorclient/ui/MainController.java    |  90 +++++++-
 .../moderatorclient/ui/ViewHelper.java        | 108 +++++++++
 .../ui/domain/AbstractEntityFX.java           |  60 +++++
 .../moderatorclient/ui/domain/MapFX.java      | 152 +++++++++++++
 .../ui/domain/MapVersionFX.java               | 207 ++++++++++++++++++
 .../moderatorclient/ui/domain/PlayerFX.java   | 101 +++++++++
 src/main/resources/application-dev.yml        |   4 +-
 src/main/resources/ui/mainWindow.fxml         | 144 +++++++++++-
 23 files changed, 1161 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/CycleAvoidingMappingContext.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/AbstractEntityFX.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/MapVersionFX.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java

diff --git a/pom.xml b/pom.xml
index 7f0200f..63760d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+
+        <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
     </properties>
 
     <repositories>
@@ -86,6 +88,17 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${org.mapstruct.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -99,6 +112,33 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.16.18</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <compilerArgs>
+                        <compilerArg>
+                            <!-- Note: add this to your IntelliJ compiler arguments -->
+                            -Amapstruct.defaultComponentModel=jsr330
+                        </compilerArg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/AbstractEntity.java b/src/main/java/com/faforever/moderatorclient/api/dto/AbstractEntity.java
index 393d515..fee1a55 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/AbstractEntity.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/AbstractEntity.java
@@ -3,10 +3,12 @@
 import com.github.jasminb.jsonapi.annotations.Id;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.time.OffsetDateTime;
 
 @Getter
+@Setter
 @EqualsAndHashCode(of = "id")
 public abstract class AbstractEntity {
     @Id
diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/Map.java b/src/main/java/com/faforever/moderatorclient/api/dto/Map.java
index 4ed0767..bc27fd1 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/Map.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/Map.java
@@ -1,5 +1,6 @@
 package com.faforever.moderatorclient.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
@@ -31,8 +32,10 @@ public class Map {
     private MapStatistics statistics;
 
     @Relationship("latestVersion")
+    @JsonIgnore
     private MapVersion latestVersion;
 
     @Relationship("versions")
+    @JsonIgnore
     private List<MapVersion> versions;
 }
diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/MapVersion.java b/src/main/java/com/faforever/moderatorclient/api/dto/MapVersion.java
index 1a917ae..6c29034 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/MapVersion.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/MapVersion.java
@@ -1,38 +1,29 @@
 package com.faforever.moderatorclient.api.dto;
 
-import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.URL;
-import java.time.OffsetDateTime;
 import java.util.List;
 
 @Getter
 @Setter
-@EqualsAndHashCode(of = "id")
 @Type("mapVersion")
-public class MapVersion {
-
-    @Id
-    private String id;
+public class MapVersion extends AbstractEntity {
     private String description;
-    private int maxPlayers;
-    private int width;
-    private int height;
+    private Integer maxPlayers;
+    private Integer width;
+    private Integer height;
     private ComparableVersion version;
     private String folderName;
     // TODO name consistently with folderName
     private String filename;
     private boolean ranked;
     private boolean hidden;
-    private OffsetDateTime createTime;
-    private OffsetDateTime updateTime;
     private URL thumbnailUrlSmall;
     private URL thumbnailUrlLarge;
     private URL downloadUrl;
diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/Player.java b/src/main/java/com/faforever/moderatorclient/api/dto/Player.java
index bdf2c22..aa666ba 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/Player.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/Player.java
@@ -1,23 +1,17 @@
 package com.faforever.moderatorclient.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.OffsetDateTime;
 import java.util.List;
 
 @Getter
 @Setter
-@EqualsAndHashCode(of = "id")
 @Type("player")
-public class Player {
-    @Id
-    private String id;
+public class Player extends AbstractEntity {
     private String login;
     @Relationship("names")
     List<NameRecord> names;
@@ -28,8 +22,6 @@ public class Player {
     private String steamId;
     @RestrictedVisibility("IsModerator")
     private String recentIpAddress;
-    private OffsetDateTime createTime;
-    private OffsetDateTime updateDateTime;
 
     @Relationship("globalRating")
     private GlobalRating globalRating;
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/ElideRouteBuilder.java b/src/main/java/com/faforever/moderatorclient/api/rest/ElideRouteBuilder.java
index ed49921..f53c343 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/ElideRouteBuilder.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/ElideRouteBuilder.java
@@ -21,6 +21,7 @@ public class ElideRouteBuilder<T> {
     @Getter
     private Class<T> dtoClass;
     private String id = null;
+    private String relationship = null;
     private Condition<?> filterCondition;
     private List<String> includes = new ArrayList<>();
     private List<String> sorts = new ArrayList<>();
@@ -47,6 +48,7 @@ public ElideRouteBuilder<T> addInclude(String include) {
     }
 
     public ElideRouteBuilder<T> id(String id) {
+        Assert.hasLength(id, "id must be given");
         Assert.state(filterCondition == null, "lookup of id and filter cannot be combined");
         Assert.state(pageSize == null, "lookup of id and pageSize cannot be combined");
         Assert.state(pageNumber == null, "lookup of id and pageNumber cannot be combined");
@@ -55,6 +57,17 @@ public ElideRouteBuilder<T> id(String id) {
         return this;
     }
 
+    public ElideRouteBuilder<T> relationship(String name) {
+        Assert.hasLength(name, "name must be given");
+        Assert.state(id != null, "relationship can  only be set after id");
+        Assert.state(filterCondition == null, "lookup of id and filter cannot be combined");
+        Assert.state(pageSize == null, "lookup of id and pageSize cannot be combined");
+        Assert.state(pageNumber == null, "lookup of id and pageNumber cannot be combined");
+        log.trace("relationship added: {}", name);
+        this.relationship = name;
+        return this;
+    }
+
     public ElideRouteBuilder<T> filter(Condition<?> eq) {
         Assert.state(id == null, "lookup of id and filter cannot be combined");
         log.trace("filter set: {}", eq.toString());
@@ -112,6 +125,7 @@ public String build() {
         String route = "/data/" +
                 dtoPath +
                 (id == null ? "" : "/" + id) +
+                (relationship == null ? "" : "/" + relationship) +
                 queryArgs.toString();
         log.debug("Route built: {}", route);
         return route;
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java b/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java
index 69af688..067e017 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java
@@ -127,6 +127,15 @@ public <T> T post(ElideRouteBuilder<T> routeBuilder, T object) {
         return entity.getBody();
     }
 
+    @SneakyThrows
+    public Object postRelationship(ElideRouteBuilder<?> routeBuilder, Object object) {
+        authorizedLatch.await();
+        JSONAPIDocument<?> data = new JSONAPIDocument<>(object);
+        String dataString = new String(resourceConverter.writeDocument(data));
+        ResponseEntity<?> entity = restOperations.postForEntity(routeBuilder.build(), dataString, routeBuilder.getDtoClass());
+        return entity.getBody();
+    }
+
     @SneakyThrows
     public <T> T patch(ElideRouteBuilder<T> routeBuilder, T object) {
         authorizedLatch.await();
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/MapService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/MapService.java
index 29d7e9c..ef2e3c4 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/MapService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/MapService.java
@@ -6,8 +6,10 @@
 import com.faforever.moderatorclient.api.rest.ElideRouteBuilder;
 import com.faforever.moderatorclient.api.rest.FafApiCommunicationService;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,6 +22,50 @@ public MapService(FafApiCommunicationService fafApi) {
         this.fafApi = fafApi;
     }
 
+
+    private List<Map> findMapsByAttribute(@NotNull String attribute, @NotNull String pattern, boolean excludeHidden) {
+        log.debug("Searching for maps by attribute '{}' with pattern: {}", attribute, pattern);
+        ElideRouteBuilder<MapVersion> routeBuilder = ElideRouteBuilder.of(MapVersion.class)
+                .addInclude("map")
+                .addInclude("map.author");
+
+        if (excludeHidden) {
+            routeBuilder.filter(ElideRouteBuilder.qBuilder().string("map." + attribute).eq(pattern)
+                    .and().bool("hidden").isFalse());
+        } else {
+            routeBuilder.filter(ElideRouteBuilder.qBuilder().string("map." + attribute).eq(pattern));
+        }
+
+        List<Map> result = fafApi.getAll(routeBuilder).stream()
+                .map(MapVersion::getMap)
+                .distinct()
+                .collect(Collectors.toList());
+
+        // filter empty mapVersions that were created by map relationships
+        for (Map map : result) {
+            for (MapVersion mapVersion : new ArrayList<>(map.getVersions())) {
+                if (mapVersion.getMap() == null) {
+                    map.getVersions().remove(mapVersion);
+                }
+            }
+        }
+
+        log.trace("found {} maps", result.size());
+        return result;
+    }
+
+    public List<Map> findMapsByName(@NotNull String pattern, boolean excludeHidden) {
+        return findMapsByAttribute("displayName", pattern, excludeHidden);
+    }
+
+    public List<Map> findMapsByAuthorId(@NotNull String pattern, boolean excludeHidden) {
+        return findMapsByAttribute("author.id", pattern, excludeHidden);
+    }
+
+    public List<Map> findMapsByAuthorName(@NotNull String pattern, boolean excludeHidden) {
+        return findMapsByAttribute("author.login", pattern, excludeHidden);
+    }
+
     public List<Map> findMaps(String mapNamePattern) {
         log.debug("Searching for maps with pattern: {}", mapNamePattern);
         ElideRouteBuilder<Map> routeBuilder = ElideRouteBuilder.of(Map.class)
@@ -58,6 +104,16 @@ public void removeMapVersionFromLadderPool(String mapVersionId) {
 
     public void addMapVersionToLadderPool(String mapVersionID) {
         log.debug("Adding mapVersion to ladder pool: {}", mapVersionID);
-        fafApi.post(ElideRouteBuilder.of(Ladder1v1Map.class), new Ladder1v1Map().setMapVersion(new MapVersion().setId(mapVersionID)));
+        fafApi.post(ElideRouteBuilder.of(Ladder1v1Map.class), new Ladder1v1Map().setMapVersion((MapVersion) new MapVersion().setId(mapVersionID)));
+    }
+
+    public void patchMapVersion(MapVersion mapVersion) {
+        log.debug("Updating mapVersion id: {}", mapVersion.getId());
+        fafApi.patch(ElideRouteBuilder.of(MapVersion.class).id(mapVersion.getId()),
+                (MapVersion) new MapVersion()
+                        .setHidden(mapVersion.isHidden())
+                        .setRanked(mapVersion.isRanked())
+                        .setId(mapVersion.getId()
+                        ));
     }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
index af05cf2..f866b71 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
@@ -132,7 +132,11 @@ public BanInfo patchBanInfo(@NotNull BanInfo banInfo) {
     public BanRevokeData revokeBan(@NotNull BanRevokeData banRevokeData) {
         log.debug("Revoking ban with id: ", banRevokeData.getBan().getId());
         banRevokeData.setAuthor(fafApi.getSelfPlayer());
-        return fafApi.post(ElideRouteBuilder.of(BanRevokeData.class), banRevokeData);
+        ElideRouteBuilder<Player> routeBuilder = ElideRouteBuilder.of(Player.class)
+                .id(banRevokeData.getBan().getId())
+                .relationship("banRevokeData");
+
+        return (BanRevokeData) fafApi.postRelationship(routeBuilder, banRevokeData);
     }
 
     public BanInfo createBan(@NotNull BanInfo banInfo) {
diff --git a/src/main/java/com/faforever/moderatorclient/config/JsonApiConfig.java b/src/main/java/com/faforever/moderatorclient/config/JsonApiConfig.java
index 2878831..e0e34ee 100644
--- a/src/main/java/com/faforever/moderatorclient/config/JsonApiConfig.java
+++ b/src/main/java/com/faforever/moderatorclient/config/JsonApiConfig.java
@@ -1,5 +1,6 @@
 package com.faforever.moderatorclient.config;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.jasminb.jsonapi.ResourceConverter;
 import com.github.jasminb.jsonapi.annotations.Type;
@@ -19,6 +20,7 @@ public class JsonApiConfig {
 
     @Bean
     public ResourceConverter resourceConverter(ObjectMapper objectMapper) {
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         return new ResourceConverter(objectMapper, findJsonApiTypes("com.faforever.moderatorclient.api.dto"));
     }
 
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/CycleAvoidingMappingContext.java b/src/main/java/com/faforever/moderatorclient/mapstruct/CycleAvoidingMappingContext.java
new file mode 100644
index 0000000..687fedb
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/CycleAvoidingMappingContext.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
+ * and/or other contributors as indicated by the @authors tag. See the
+ * copyright.txt file in the distribution for a full listing of all
+ * contributors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.faforever.moderatorclient.mapstruct;
+
+import org.mapstruct.*;
+import org.springframework.stereotype.Component;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+/**
+ * A type to be used as {@link Context} parameter to track cycles in graphs.
+ * <p>
+ * Depending on the actual use case, the two methods below could also be changed to only accept certain argument types,
+ * e.g. base classes of graph nodes, avoiding the need to capture any other objects that wouldn't necessarily result in
+ * cycles.
+ *
+ * @author Andreas Gudian
+ */
+@Component
+public class CycleAvoidingMappingContext {
+    private Map<Object, Object> knownInstances = new IdentityHashMap<>();
+
+    @BeforeMapping
+    public <T> T getMappedInstance(Object source, @TargetType Class<T> targetType) {
+        return (T) knownInstances.get(source);
+    }
+
+    @BeforeMapping
+    public void storeMappedInstance(Object source, @MappingTarget Object target) {
+        knownInstances.put(source, target);
+    }
+
+    @AfterMapping
+    public void cleanupKnownInstances() {
+//        knownInstances.clear();
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java
new file mode 100644
index 0000000..68dc847
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java
@@ -0,0 +1,47 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import javafx.beans.property.*;
+import org.springframework.stereotype.Component;
+
+@Component
+public class JavaFXMapper {
+    public BooleanProperty map(Boolean value) {
+        return new SimpleBooleanProperty(value);
+    }
+
+    public Boolean map(BooleanProperty value) {
+        return value.get();
+    }
+
+    public StringProperty map(String value) {
+        return new SimpleStringProperty(value);
+    }
+
+    public String map(StringProperty value) {
+        return value.get();
+    }
+
+    public IntegerProperty map(Integer value) {
+        return new SimpleIntegerProperty(value);
+    }
+
+    public Integer map(IntegerProperty value) {
+        return value.get();
+    }
+
+    public <T> ObjectProperty<T> map(T value) {
+        return new SimpleObjectProperty<>(value);
+    }
+
+    public <T> T map(ObjectProperty<T> value) {
+        return value.get();
+    }
+
+//    public <T> ListProperty<T> mapListToListProperty (List<T> value) {
+//        return new SimpleListProperty<>(FXCollections.observableList(value));
+//    }
+//
+//    public <T> List<T> map (ListProperty<T> value) {
+//        return value.get();
+//    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java
new file mode 100644
index 0000000..030367a
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java
@@ -0,0 +1,30 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.Map;
+import com.faforever.moderatorclient.ui.domain.MapFX;
+import org.mapstruct.AfterMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+
+import java.util.List;
+
+@Mapper(uses = {JavaFXMapper.class, MapVersionMapper.class})
+public abstract class MapMapper {
+    public abstract MapFX map(Map map);
+
+    @AfterMapping
+    protected void addBackReferences(@MappingTarget MapFX mapFX) {
+        mapFX.getVersions().forEach(mapVersionFX -> mapVersionFX.setMap(mapFX));
+        mapFX.getLatestVersion().setMap(mapFX);
+    }
+
+    public abstract Map map(MapFX mapFX);
+
+    @AfterMapping
+    protected void addBackReferences(@MappingTarget Map map) {
+        map.getVersions().forEach(mapVersionFX -> mapVersionFX.setMap(map));
+        map.getLatestVersion().setMap(map);
+    }
+
+    public abstract List<MapFX> map(List<Map> mapList);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
new file mode 100644
index 0000000..c0e8b14
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
@@ -0,0 +1,21 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.MapVersion;
+import com.faforever.moderatorclient.ui.domain.MapVersionFX;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.List;
+
+@Mapper(uses = {JavaFXMapper.class})
+public interface MapVersionMapper {
+    @Mapping(target = "map", ignore = true)
+    MapVersionFX map(MapVersion mapVersion);
+
+    @Mapping(target = "map", ignore = true)
+    MapVersion map(MapVersionFX mapVersionFX);
+
+    List<MapVersionFX> mapToFX(List<MapVersion> mapVersionList);
+
+    List<MapVersion> mapToDTo(List<MapVersionFX> mapVersionFXList);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java
new file mode 100644
index 0000000..fad3fb4
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java
@@ -0,0 +1,16 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.Player;
+import com.faforever.moderatorclient.ui.domain.PlayerFX;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(uses = {JavaFXMapper.class, CycleAvoidingMappingContext.class})
+public interface PlayerMapper {
+    PlayerFX map(Player player);
+
+    Player map(PlayerFX playerFX);
+
+    List<PlayerFX> map(List<Player> playerList);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index c917c7f..fd0ad0c 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -4,10 +4,16 @@
 import com.faforever.moderatorclient.api.rest.domain.AvatarService;
 import com.faforever.moderatorclient.api.rest.domain.MapService;
 import com.faforever.moderatorclient.api.rest.domain.UserService;
+import com.faforever.moderatorclient.mapstruct.MapMapper;
+import com.faforever.moderatorclient.mapstruct.MapVersionMapper;
+import com.faforever.moderatorclient.mapstruct.PlayerMapper;
+import com.faforever.moderatorclient.ui.domain.MapFX;
+import com.faforever.moderatorclient.ui.domain.MapVersionFX;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
@@ -17,17 +23,24 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 @Component
 @Slf4j
 public class MainController implements Controller<TabPane> {
+    private final MapMapper mapMapper;
+    private final MapVersionMapper mapVersionMapper;
+    private final PlayerMapper playerMapper;
+
     private final UiService uiService;
     private final UserService userService;
     private final MapService mapService;
     private final AvatarService avatarService;
+
     public TabPane root;
 
+
     // Tab "User Management"
     public RadioButton searchUserByIdRadioButton;
     public RadioButton searchUserByCurrentNameRadioButton;
@@ -54,6 +67,18 @@ public class MainController implements Controller<TabPane> {
     public Button removeFromPoolButton;
     public Button addToPoolButton;
 
+    // Tab "Map vault"
+    public RadioButton searchMapByMapNameRadioButton;
+    public RadioButton searchMapByAuthorIdRadioButton;
+    public RadioButton searchMapByAuthorNameRadioButton;
+    public TextField mapSearchTextField;
+    public CheckBox excludeHiddenMapVersionsCheckbox;
+    public ImageView mapVersionPreviewImageView;
+    public TableView<MapFX> mapSearchTableView;
+    public TableView<MapVersionFX> mapVersionTableView;
+    public Button toggleMapVersionHidingButton;
+    public Button toggleMapVersionRatingButton;
+
     // Tab "Avatars"
     public TableView<Avatar> avatarTableView;
     public TableView<AvatarAssignment> avatarAssignmentTableView;
@@ -67,7 +92,10 @@ public class MainController implements Controller<TabPane> {
     public TableView<Player> userRegistrationFeedTableView;
     public TableView<Teamkill> teamkillFeedTableView;
 
-    public MainController(UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService) {
+    public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService) {
+        this.mapMapper = mapMapper;
+        this.mapVersionMapper = mapVersionMapper;
+        this.playerMapper = playerMapper;
         this.uiService = uiService;
         this.userService = userService;
         this.mapService = mapSearchService;
@@ -83,6 +111,7 @@ public TabPane getRoot() {
     public void initialize() {
         initUserManagementTab();
         initLadderMapPoolTab();
+        initMapVaultTab();
         initAvatarTab();
         initRecentActivityTab();
     }
@@ -123,6 +152,29 @@ private void initLadderMapPoolTab() {
         });
     }
 
+    private void initMapVaultTab() {
+        ViewHelper.buildMapTableView(mapSearchTableView);
+        ViewHelper.buildMapVersionTableView(mapVersionTableView);
+
+        mapSearchTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            mapVersionTableView.getItems().clear();
+            Optional.ofNullable(newValue).ifPresent(map -> mapVersionTableView.getItems().addAll(
+                    map.getVersions()));
+        });
+
+        mapVersionTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue == null) {
+                mapVersionPreviewImageView.setImage(null);
+                toggleMapVersionHidingButton.setDisable(true);
+                toggleMapVersionRatingButton.setDisable(true);
+            } else {
+                mapVersionPreviewImageView.setImage(new Image(newValue.getThumbnailUrlLarge().toString()));
+                toggleMapVersionHidingButton.setDisable(false);
+                toggleMapVersionRatingButton.setDisable(false);
+            }
+        });
+    }
+
     private void initAvatarTab() {
         ViewHelper.buildAvatarTableView(avatarTableView);
         ViewHelper.buildAvatarAssignmentTableView(avatarAssignmentTableView);
@@ -256,6 +308,23 @@ public void onSearchMapVault() {
                 mapService.findMaps(mapNamePattern).stream());
     }
 
+    public void onSearchMaps() {
+        mapSearchTableView.getItems().clear();
+        mapSearchTableView.getSortOrder().clear();
+
+        List<Map> mapsFound = Collections.emptyList();
+        String searchPattern = mapSearchTextField.getText();
+        if (searchMapByMapNameRadioButton.isSelected()) {
+            mapsFound = mapService.findMapsByName(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
+        } else if (searchMapByAuthorIdRadioButton.isSelected()) {
+            mapsFound = mapService.findMapsByAuthorId(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
+        } else if (searchMapByAuthorNameRadioButton.isSelected()) {
+            mapsFound = mapService.findMapsByAuthorName(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
+        }
+
+        mapSearchTableView.getItems().addAll(mapMapper.map(mapsFound));
+    }
+
     public void onSearchAvatars() {
         avatarTableView.getItems().clear();
         avatarTableView.getSortOrder().clear();
@@ -301,4 +370,23 @@ public void onEditBan() {
         banInfoDialog.setScene(new Scene(banInfoController.getRoot()));
         banInfoDialog.showAndWait();
     }
+
+
+    public void onToggleMapVersionHiding() {
+        MapVersionFX mapVersion = mapVersionTableView.getSelectionModel().getSelectedItem();
+
+        Assert.notNull(mapVersion, "You can only edit a selected MapVersion");
+
+        mapVersion.setHidden(!mapVersion.isHidden());
+        mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
+    }
+
+    public void onToggleMapVersionRanking() {
+        MapVersionFX mapVersion = mapVersionTableView.getSelectionModel().getSelectedItem();
+
+        Assert.notNull(mapVersion, "You can only edit a selected MapVersion");
+
+        mapVersion.setRanked(!mapVersion.isRanked());
+        mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index e29255b..6507877 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -1,8 +1,12 @@
 package com.faforever.moderatorclient.ui;
 
 import com.faforever.moderatorclient.api.dto.*;
+import com.faforever.moderatorclient.ui.domain.MapFX;
+import com.faforever.moderatorclient.ui.domain.MapVersionFX;
+import com.faforever.moderatorclient.ui.domain.PlayerFX;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.*;
+import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.control.cell.TreeItemPropertyValueFactory;
@@ -13,6 +17,7 @@
 import org.apache.maven.artifact.versioning.ComparableVersion;
 
 import java.net.URL;
+import java.text.MessageFormat;
 import java.time.OffsetDateTime;
 import java.util.Comparator;
 import java.util.Optional;
@@ -404,6 +409,109 @@ static void buildMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView) {
         mapTreeView.setShowRoot(false);
     }
 
+    static void buildMapTableView(TableView<MapFX> tableView) {
+        TableColumn<MapFX, String> idColumn = new TableColumn<>("Map ID");
+        idColumn.setCellValueFactory(o -> o.getValue().idProperty());
+        idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
+        idColumn.setMinWidth(100);
+        tableView.getColumns().add(idColumn);
+
+        TableColumn<MapFX, String> nameColumn = new TableColumn<>("Name");
+        nameColumn.setCellValueFactory(o -> o.getValue().displayNameProperty());
+        nameColumn.setMinWidth(200);
+        tableView.getColumns().add(nameColumn);
+
+
+        TableColumn<MapFX, PlayerFX> authorColumn = new TableColumn<>("Author");
+        authorColumn.setCellValueFactory(o -> o.getValue().authorProperty());
+        authorColumn.setCellFactory(o -> new TableCell<MapFX, PlayerFX>() {
+            Label label;
+
+            {
+                label = new Label();
+                setGraphic(label);
+            }
+
+            @Override
+            protected void updateItem(PlayerFX item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (empty) {
+                    label.setText("");
+                } else if (item == null) {
+                    label.setText("unknown");
+                } else {
+                    label.setText(MessageFormat.format("{0} [id = {1}]", item.getLogin(), item.getId()));
+                }
+            }
+        });
+        authorColumn.setMinWidth(200);
+        tableView.getColumns().add(authorColumn);
+
+        TableColumn<MapFX, OffsetDateTime> createTimeColumn = new TableColumn<>("First upload");
+        createTimeColumn.setCellValueFactory(o -> o.getValue().createTimeProperty());
+        createTimeColumn.setMinWidth(160);
+        tableView.getColumns().add(createTimeColumn);
+
+        TableColumn<MapFX, OffsetDateTime> updateTimeColumn = new TableColumn<>("Last update");
+        updateTimeColumn.setCellValueFactory(o -> o.getValue().updateTimeProperty());
+        updateTimeColumn.setMinWidth(160);
+        tableView.getColumns().add(updateTimeColumn);
+    }
+
+    static void buildMapVersionTableView(TableView<MapVersionFX> tableView) {
+        TableColumn<MapVersionFX, String> idColumn = new TableColumn<>("Version ID");
+        idColumn.setCellValueFactory(o -> o.getValue().idProperty());
+        idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
+        idColumn.setMinWidth(100);
+        tableView.getColumns().add(idColumn);
+
+        TableColumn<MapVersionFX, ComparableVersion> nameColumn = new TableColumn<>("Version No.");
+        nameColumn.setCellValueFactory(o -> o.getValue().versionProperty());
+        nameColumn.setMinWidth(100);
+        tableView.getColumns().add(nameColumn);
+
+
+        TableColumn<MapVersionFX, Boolean> rankedCheckBoxColumn = new TableColumn<>("Ranked");
+        rankedCheckBoxColumn.setCellValueFactory(param -> param.getValue().rankedProperty());
+        rankedCheckBoxColumn.setCellFactory(CheckBoxTableCell.forTableColumn(rankedCheckBoxColumn));
+        tableView.getColumns().add(rankedCheckBoxColumn);
+
+        TableColumn<MapVersionFX, Boolean> hiddenColumn = new TableColumn<>("Hidden");
+        hiddenColumn.setCellValueFactory(o -> o.getValue().hiddenProperty());
+        hiddenColumn.setCellFactory(CheckBoxTableCell.forTableColumn(hiddenColumn));
+        tableView.getColumns().add(hiddenColumn);
+
+        TableColumn<MapVersionFX, Number> maxPlayersColumn = new TableColumn<>("Max Players");
+        maxPlayersColumn.setCellValueFactory(o -> o.getValue().maxPlayersProperty());
+        maxPlayersColumn.setMinWidth(130);
+        tableView.getColumns().add(maxPlayersColumn);
+
+        TableColumn<MapVersionFX, Number> widthColumn = new TableColumn<>("Width");
+        widthColumn.setCellValueFactory(o -> o.getValue().widthProperty());
+        tableView.getColumns().add(widthColumn);
+
+        TableColumn<MapVersionFX, Number> heightColumn = new TableColumn<>("Height");
+        heightColumn.setCellValueFactory(o -> o.getValue().heightProperty());
+        tableView.getColumns().add(heightColumn);
+
+        TableColumn<MapVersionFX, String> descriptionColumn = new TableColumn<>("Description");
+        descriptionColumn.setCellValueFactory(o -> o.getValue().descriptionProperty());
+        descriptionColumn.setMinWidth(300);
+        tableView.getColumns().add(descriptionColumn);
+
+
+        TableColumn<MapVersionFX, OffsetDateTime> createTimeColumn = new TableColumn<>("Uploaded");
+        createTimeColumn.setCellValueFactory(o -> o.getValue().createTimeProperty());
+        createTimeColumn.setMinWidth(160);
+        tableView.getColumns().add(createTimeColumn);
+
+        TableColumn<MapVersionFX, OffsetDateTime> updateTimeColumn = new TableColumn<>("Last update");
+        updateTimeColumn.setCellValueFactory(o -> o.getValue().updateTimeProperty());
+        updateTimeColumn.setMinWidth(160);
+        tableView.getColumns().add(updateTimeColumn);
+    }
+
     static void fillMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView, Stream<Map> mapStream) {
         mapStream.forEach(map -> {
             TreeItem<MapTableItemAdapter> mapItem = new TreeItem<>(new MapTableItemAdapter(map));
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/AbstractEntityFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/AbstractEntityFX.java
new file mode 100644
index 0000000..8ae71d6
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/AbstractEntityFX.java
@@ -0,0 +1,60 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import java.time.OffsetDateTime;
+
+public abstract class AbstractEntityFX {
+    private boolean dirty;
+    private final StringProperty id;
+    private final ObjectProperty<OffsetDateTime> createTime;
+    private final ObjectProperty<OffsetDateTime> updateTime;
+
+    protected AbstractEntityFX() {
+        id = new SimpleStringProperty();
+        createTime = new SimpleObjectProperty<>();
+        updateTime = new SimpleObjectProperty<>();
+    }
+
+    public String getId() {
+        return id.get();
+    }
+
+    public void setId(String id) {
+        dirty = true;
+        this.id.set(id);
+    }
+
+    public StringProperty idProperty() {
+        return id;
+    }
+
+    public OffsetDateTime getCreateTime() {
+        return createTime.get();
+    }
+
+    public void setCreateTime(OffsetDateTime createTime) {
+        dirty = true;
+        this.createTime.set(createTime);
+    }
+
+    public ObjectProperty<OffsetDateTime> createTimeProperty() {
+        return createTime;
+    }
+
+    public OffsetDateTime getUpdateTime() {
+        return updateTime.get();
+    }
+
+    public void setUpdateTime(OffsetDateTime updateTime) {
+        dirty = true;
+        this.updateTime.set(updateTime);
+    }
+
+    public ObjectProperty<OffsetDateTime> updateTimeProperty() {
+        return updateTime;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java
new file mode 100644
index 0000000..fd8c80d
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java
@@ -0,0 +1,152 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+public class MapFX extends AbstractEntityFX {
+    private final StringProperty id;
+    private final StringProperty battleType;
+    private final ObjectProperty<OffsetDateTime> createTime;
+    private final ObjectProperty<OffsetDateTime> updateTime;
+    private final StringProperty displayName;
+    private final ObjectProperty<PlayerFX> author;
+    private final StringProperty mapType;
+    private final ObjectProperty<MapVersionFX> latestVersion;
+    private final ObservableList<MapVersionFX> versions;
+
+    public MapFX() {
+        id = new SimpleStringProperty();
+        battleType = new SimpleStringProperty();
+        createTime = new SimpleObjectProperty<>();
+        updateTime = new SimpleObjectProperty<>();
+        displayName = new SimpleStringProperty();
+        author = new SimpleObjectProperty<>();
+        mapType = new SimpleStringProperty();
+        latestVersion = new SimpleObjectProperty<>();
+        versions = FXCollections.observableArrayList();
+    }
+
+    @Override
+    public String getId() {
+        return id.get();
+    }
+
+    public void setId(String id) {
+        this.id.set(id);
+    }
+
+    @Override
+    public StringProperty idProperty() {
+        return id;
+    }
+
+    public String getBattleType() {
+        return battleType.get();
+    }
+
+    public void setBattleType(String battleType) {
+        this.battleType.set(battleType);
+    }
+
+    public StringProperty battleTypeProperty() {
+        return battleType;
+    }
+
+    @Override
+    public OffsetDateTime getCreateTime() {
+        return createTime.get();
+    }
+
+    public void setCreateTime(OffsetDateTime createTime) {
+        this.createTime.set(createTime);
+    }
+
+    @Override
+    public ObjectProperty<OffsetDateTime> createTimeProperty() {
+        return createTime;
+    }
+
+    @Override
+    public OffsetDateTime getUpdateTime() {
+        return updateTime.get();
+    }
+
+    public void setUpdateTime(OffsetDateTime updateTime) {
+        this.updateTime.set(updateTime);
+    }
+
+    @Override
+    public ObjectProperty<OffsetDateTime> updateTimeProperty() {
+        return updateTime;
+    }
+
+    public String getDisplayName() {
+        return displayName.get();
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName.set(displayName);
+    }
+
+    public StringProperty displayNameProperty() {
+        return displayName;
+    }
+
+    public PlayerFX getAuthor() {
+        return author.get();
+    }
+
+    public void setAuthor(PlayerFX author) {
+        this.author.set(author);
+    }
+
+    public ObjectProperty<PlayerFX> authorProperty() {
+        return author;
+    }
+
+    public String getMapType() {
+        return mapType.get();
+    }
+
+    public void setMapType(String mapType) {
+        this.mapType.set(mapType);
+    }
+
+    public StringProperty mapTypeProperty() {
+        return mapType;
+    }
+
+    public MapVersionFX getLatestVersion() {
+        return latestVersion.get();
+    }
+
+    public void setLatestVersion(MapVersionFX latestVersion) {
+        this.latestVersion.set(latestVersion);
+    }
+
+    public ObjectProperty<MapVersionFX> latestVersionProperty() {
+        return latestVersion;
+    }
+
+    public ObservableList<MapVersionFX> getVersions() {
+        return versions;
+    }
+
+    public void setVersions(List<MapVersionFX> versionFXList) {
+        versions.addAll(versionFXList);
+    }
+
+    //    @Relationship("author")
+//    private Player author;
+//
+//    @Relationship("statistics")
+//    private MapStatistics statistics;
+
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/MapVersionFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/MapVersionFX.java
new file mode 100644
index 0000000..437da81
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/MapVersionFX.java
@@ -0,0 +1,207 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import javafx.beans.property.*;
+import org.apache.maven.artifact.versioning.ComparableVersion;
+
+import java.net.URL;
+
+public class MapVersionFX extends AbstractEntityFX {
+    private final StringProperty description;
+    private final IntegerProperty maxPlayers;
+    private final IntegerProperty width;
+    private final IntegerProperty height;
+    private final ObjectProperty<ComparableVersion> version;
+    private final StringProperty folderName;
+    // TODO name consistently with folderName
+    private final StringProperty filename;
+    private final BooleanProperty ranked;
+    private final BooleanProperty hidden;
+    private final ObjectProperty<URL> thumbnailUrlSmall;
+    private final ObjectProperty<URL> thumbnailUrlLarge;
+    private final ObjectProperty<URL> downloadUrl;
+
+    private final ObjectProperty<MapFX> map;
+
+    public MapVersionFX() {
+        description = new SimpleStringProperty();
+        maxPlayers = new SimpleIntegerProperty();
+        width = new SimpleIntegerProperty();
+        height = new SimpleIntegerProperty();
+        version = new SimpleObjectProperty<>();
+        folderName = new SimpleStringProperty();
+        filename = new SimpleStringProperty();
+        ranked = new SimpleBooleanProperty();
+        hidden = new SimpleBooleanProperty();
+        thumbnailUrlSmall = new SimpleObjectProperty<>();
+        thumbnailUrlLarge = new SimpleObjectProperty<>();
+        downloadUrl = new SimpleObjectProperty<>();
+        map = new SimpleObjectProperty<>();
+    }
+
+//
+//    @Relationship("statistics")
+//    private MapVersionStatistics statistics;
+//
+//    @Nullable
+//    @Relationship("ladder1v1Map")
+//    private Ladder1v1Map ladder1v1Map;
+//
+//    @Relationship("reviews")
+//    private List<MapVersionReview> reviews;
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    public void setDescription(String description) {
+        this.description.set(description);
+    }
+
+    public StringProperty descriptionProperty() {
+        return description;
+    }
+
+    public int getMaxPlayers() {
+        return maxPlayers.get();
+    }
+
+    public void setMaxPlayers(int maxPlayers) {
+        this.maxPlayers.set(maxPlayers);
+    }
+
+    public IntegerProperty maxPlayersProperty() {
+        return maxPlayers;
+    }
+
+    public int getWidth() {
+        return width.get();
+    }
+
+    public void setWidth(int width) {
+        this.width.set(width);
+    }
+
+    public IntegerProperty widthProperty() {
+        return width;
+    }
+
+    public int getHeight() {
+        return height.get();
+    }
+
+    public void setHeight(int height) {
+        this.height.set(height);
+    }
+
+    public IntegerProperty heightProperty() {
+        return height;
+    }
+
+    public ComparableVersion getVersion() {
+        return version.get();
+    }
+
+    public void setVersion(ComparableVersion version) {
+        this.version.set(version);
+    }
+
+    public ObjectProperty<ComparableVersion> versionProperty() {
+        return version;
+    }
+
+    public String getFolderName() {
+        return folderName.get();
+    }
+
+    public void setFolderName(String folderName) {
+        this.folderName.set(folderName);
+    }
+
+    public StringProperty folderNameProperty() {
+        return folderName;
+    }
+
+    public String getFilename() {
+        return filename.get();
+    }
+
+    public void setFilename(String filename) {
+        this.filename.set(filename);
+    }
+
+    public StringProperty filenameProperty() {
+        return filename;
+    }
+
+    public boolean isRanked() {
+        return ranked.get();
+    }
+
+    public void setRanked(boolean ranked) {
+        this.ranked.set(ranked);
+    }
+
+    public BooleanProperty rankedProperty() {
+        return ranked;
+    }
+
+    public boolean isHidden() {
+        return hidden.get();
+    }
+
+    public void setHidden(boolean hidden) {
+        this.hidden.set(hidden);
+    }
+
+    public BooleanProperty hiddenProperty() {
+        return hidden;
+    }
+
+    public URL getThumbnailUrlSmall() {
+        return thumbnailUrlSmall.get();
+    }
+
+    public void setThumbnailUrlSmall(URL thumbnailUrlSmall) {
+        this.thumbnailUrlSmall.set(thumbnailUrlSmall);
+    }
+
+    public ObjectProperty<URL> thumbnailUrlSmallProperty() {
+        return thumbnailUrlSmall;
+    }
+
+    public URL getThumbnailUrlLarge() {
+        return thumbnailUrlLarge.get();
+    }
+
+    public void setThumbnailUrlLarge(URL thumbnailUrlLarge) {
+        this.thumbnailUrlLarge.set(thumbnailUrlLarge);
+    }
+
+    public ObjectProperty<URL> thumbnailUrlLargeProperty() {
+        return thumbnailUrlLarge;
+    }
+
+    public URL getDownloadUrl() {
+        return downloadUrl.get();
+    }
+
+    public void setDownloadUrl(URL downloadUrl) {
+        this.downloadUrl.set(downloadUrl);
+    }
+
+    public ObjectProperty<URL> downloadUrlProperty() {
+        return downloadUrl;
+    }
+
+    public MapFX getMap() {
+        return map.get();
+    }
+
+    public void setMap(MapFX map) {
+        this.map.set(map);
+    }
+
+    public ObjectProperty<MapFX> mapProperty() {
+        return map;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java
new file mode 100644
index 0000000..dc32e7c
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java
@@ -0,0 +1,101 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import com.faforever.moderatorclient.mapstruct.JavaFXMapper;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import org.mapstruct.Mapper;
+
+@Mapper(uses = JavaFXMapper.class)
+public class PlayerFX extends AbstractEntityFX {
+    private final StringProperty login;
+    private final StringProperty email;
+    private final StringProperty userAgent;
+    private final StringProperty steamId;
+    private final StringProperty recentIpAddress;
+//    private final ListProperty<NameRecord> names;
+
+    public PlayerFX() {
+        login = new SimpleStringProperty();
+        email = new SimpleStringProperty();
+        userAgent = new SimpleStringProperty();
+        steamId = new SimpleStringProperty();
+        recentIpAddress = new SimpleStringProperty();
+    }
+
+//    @Relationship("globalRating")
+//    private GlobalRating globalRating;
+//
+//    @Relationship("ladder1v1Rating")
+//    private Ladder1v1Rating ladder1v1Rating;
+//
+//    @Relationship("lobbyGroup")
+//    private LobbyGroup lobbyGroup;
+//
+//    @Relationship("bans")
+//    private List<BanInfo> bans;
+//
+//    @Relationship("avatarAssignments")
+//    @JsonIgnore
+//    private List<AvatarAssignment> avatarAssignments;
+
+
+    public String getLogin() {
+        return login.get();
+    }
+
+    public void setLogin(String login) {
+        this.login.set(login);
+    }
+
+    public StringProperty loginProperty() {
+        return login;
+    }
+
+    public String getEmail() {
+        return email.get();
+    }
+
+    public void setEmail(String email) {
+        this.email.set(email);
+    }
+
+    public StringProperty emailProperty() {
+        return email;
+    }
+
+    public String getUserAgent() {
+        return userAgent.get();
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent.set(userAgent);
+    }
+
+    public StringProperty userAgentProperty() {
+        return userAgent;
+    }
+
+    public String getSteamId() {
+        return steamId.get();
+    }
+
+    public void setSteamId(String steamId) {
+        this.steamId.set(steamId);
+    }
+
+    public StringProperty steamIdProperty() {
+        return steamId;
+    }
+
+    public String getRecentIpAddress() {
+        return recentIpAddress.get();
+    }
+
+    public void setRecentIpAddress(String recentIpAddress) {
+        this.recentIpAddress.set(recentIpAddress);
+    }
+
+    public StringProperty recentIpAddressProperty() {
+        return recentIpAddress;
+    }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e61166b..89fbb9a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,8 +1,8 @@
 faforever:
   api:
     base-url: http://localhost:8010
-    client-id: postman-test
-    client-secret: postman-test
+    client-id: postman
+    client-secret: postman
     access-token-uri: ${faforever.api.base-url}/oauth/token
     max-page-size: 10_000
 logging:
diff --git a/src/main/resources/ui/mainWindow.fxml b/src/main/resources/ui/mainWindow.fxml
index 4ed0fad..3e5460a 100644
--- a/src/main/resources/ui/mainWindow.fxml
+++ b/src/main/resources/ui/mainWindow.fxml
@@ -10,7 +10,7 @@
          prefWidth="1200.0" xmlns="http://javafx.com/javafx/8.0.111"
          fx:controller="com.faforever.moderatorclient.ui.MainController">
     <tabs>
-        <Tab text="User Management">
+        <Tab closable="false" text="User Management">
             <content>
                 <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
                     <items>
@@ -249,17 +249,147 @@
                 </SplitPane>
             </content>
         </Tab>
-        <Tab text="Map vault">
+        <Tab closable="false" text="Map vault">
             <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"/>
+                <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
+                    <items>
+                        <TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE">
+                            <tabs>
+                                <Tab closable="false" text="Search">
+                                    <content>
+                                        <HBox prefHeight="100.0" prefWidth="200.0">
+                                            <children>
+                                                <VBox minWidth="220.0">
+                                                    <children>
+                                                        <RadioButton fx:id="searchMapByMapNameRadioButton"
+                                                                     mnemonicParsing="false" text="search by name">
+                                                            <VBox.margin>
+                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                            </VBox.margin>
+                                                            <toggleGroup>
+                                                                <ToggleGroup fx:id="mapSearch"/>
+                                                            </toggleGroup>
+                                                        </RadioButton>
+                                                        <RadioButton fx:id="searchMapByAuthorIdRadioButton"
+                                                                     mnemonicParsing="false" text="search by author id"
+                                                                     toggleGroup="$mapSearch">
+                                                            <padding>
+                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                            </padding>
+                                                        </RadioButton>
+                                                        <RadioButton fx:id="searchMapByAuthorNameRadioButton"
+                                                                     mnemonicParsing="false"
+                                                                     text="search by author name"
+                                                                     toggleGroup="$mapSearch">
+                                                            <padding>
+                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                            </padding>
+                                                        </RadioButton>
+                                                        <TextField fx:id="mapSearchTextField">
+                                                            <VBox.margin>
+                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                            </VBox.margin>
+                                                        </TextField>
+                                                        <CheckBox fx:id="excludeHiddenMapVersionsCheckbox"
+                                                                  mnemonicParsing="false" selected="true"
+                                                                  text="no hidden map versions">
+                                                            <VBox.margin>
+                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                            </VBox.margin>
+                                                        </CheckBox>
+                                                        <Button mnemonicParsing="false" onAction="#onSearchMaps"
+                                                                text="search map">
+                                                            <VBox.margin>
+                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                            </VBox.margin>
+                                                        </Button>
+                                                    </children>
+                                                    <HBox.margin>
+                                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                                                    </HBox.margin>
+                                                </VBox>
+                                                <VBox HBox.hgrow="ALWAYS">
+                                                    <children>
+                                                        <Label alignment="CENTER" maxHeight="1.7976931348623157E308"
+                                                               maxWidth="1.7976931348623157E308"
+                                                               style="-fx-background-color: #ccc;" text="Maps">
+                                                            <padding>
+                                                                <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
+                                                            </padding>
+                                                            <font>
+                                                                <Font name="System Bold" size="15.0"/>
+                                                            </font>
+                                                        </Label>
+                                                        <TableView fx:id="mapSearchTableView" prefHeight="200.0"
+                                                                   prefWidth="200.0" VBox.vgrow="ALWAYS"/>
+                                                    </children>
+                                                </VBox>
+                                            </children>
+                                        </HBox>
+                                    </content>
+                                </Tab>
+                            </tabs>
+                        </TabPane>
+                        <HBox>
+                            <children>
+                                <VBox alignment="CENTER" prefWidth="220.0">
+                                    <HBox.margin>
+                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                                    </HBox.margin>
+                                    <children>
+                                        <ImageView fx:id="mapVersionPreviewImageView" fitHeight="150.0" fitWidth="200.0"
+                                                   pickOnBounds="true" preserveRatio="true">
+                                            <VBox.margin>
+                                                <Insets bottom="25.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                        </ImageView>
+                                        <Button fx:id="toggleMapVersionRatingButton" disable="true"
+                                                mnemonicParsing="false" onAction="#onToggleMapVersionRanking"
+                                                text="rank / unrank">
+                                            <VBox.margin>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                        </Button>
+                                        <Button fx:id="toggleMapVersionHidingButton" disable="true"
+                                                mnemonicParsing="false" onAction="#onToggleMapVersionHiding"
+                                                text="hide / unhide">
+                                            <VBox.margin>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                        </Button>
+                                    </children>
+                                </VBox>
+                                <VBox HBox.hgrow="ALWAYS">
+                                    <children>
+                                        <Label alignment="CENTER" maxHeight="1.7976931348623157E308"
+                                               maxWidth="1.7976931348623157E308" style="-fx-background-color: #ccc;"
+                                               text="Map Versions">
+                                            <VBox.margin>
+                                                <Insets/>
+                                            </VBox.margin>
+                                            <padding>
+                                                <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
+                                            </padding>
+                                            <font>
+                                                <Font name="System Bold" size="15.0"/>
+                                            </font>
+                                        </Label>
+                                        <TableView fx:id="mapVersionTableView" prefHeight="200.0" prefWidth="200.0"
+                                                   VBox.vgrow="ALWAYS"/>
+                                    </children>
+                                </VBox>
+                            </children>
+                        </HBox>
+                    </items>
+                </SplitPane>
             </content>
         </Tab>
-        <Tab text="Mod vault">
+        <Tab closable="false" disable="true" text="Mod vault">
             <content>
                 <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"/>
             </content>
         </Tab>
-        <Tab text="Avatars">
+        <Tab closable="false" text="Avatars">
             <content>
                 <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
                     <items>
@@ -336,7 +466,7 @@
                         </VBox>
                         <TabPane minHeight="200.0">
                             <tabs>
-                                <Tab text="Assignments">
+                                <Tab closable="false" text="Assignments">
                                     <content>
                                         <TableView fx:id="avatarAssignmentTableView" editable="true" prefHeight="200.0"
                                                    prefWidth="200.0"/>
@@ -348,7 +478,7 @@
                 </SplitPane>
             </content>
         </Tab>
-        <Tab text="Recent activity">
+        <Tab closable="false" text="Recent activity">
             <content>
                 <VBox alignment="TOP_CENTER">
                     <children>

From 63545f9d9b427844ebb3b3fcfaa09d7a9d2f426d Mon Sep 17 00:00:00 2001
From: axel1200 <alexander.von.trostorff@gmail.com>
Date: Sun, 26 Nov 2017 23:46:24 +0100
Subject: [PATCH 03/14] Show number of games, latest games and ratings Fixes
 #11

---
 README.md                                     |  2 +-
 pom.xml                                       |  7 ++
 .../api/dto/GamePlayerStats.java              |  2 +-
 .../api/rest/domain/UserService.java          | 28 +++++++
 .../moderatorclient/ui/MainController.java    | 50 ++++++++++++
 .../moderatorclient/ui/ViewHelper.java        | 77 ++++++++++++++++++-
 .../moderatorclient/utils/Tools.java          | 11 +++
 src/main/resources/ui/mainWindow.fxml         | 14 ++++
 8 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/utils/Tools.java

diff --git a/README.md b/README.md
index a783cb2..9974538 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,4 @@ This application enables faforever.com moderators to perform administrative acti
 1. Import the project into IntelliJ as "Maven Project"
 1. Make sure you have the IntelliJ [Lombok plugin](https://plugins.jetbrains.com/idea/plugin/6317-lombok-plugin) installed
 1. Make sure you have `Enable annotation processing` enabled in the settings
-1. Add the dev profile as command line options ("VM options" in IntelliJ) using `-Dspring.profiles.active=dev`
+1. Add the dev profile as command line options ("VM options" in IntelliJ) using `-Dspring.profiles.active=dev`
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 63760d6..309ef8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,13 @@
             <version>1.6</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java b/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java
index b84fa53..0f368ee 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java
@@ -30,7 +30,7 @@ public class GamePlayerStats {
     @Nullable
     private OffsetDateTime scoreTime;
 
-    @Relationship("replay")
+    @Relationship("game")
     private Game replay;
 
     @Relationship("player")
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
index f866b71..0addc23 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
@@ -144,4 +144,32 @@ public BanInfo createBan(@NotNull BanInfo banInfo) {
         banInfo.setAuthor(fafApi.getSelfPlayer());
         return fafApi.post(ElideRouteBuilder.of(BanInfo.class), banInfo);
     }
+
+    public List<GamePlayerStats> getLastHunderedPlayedGamesByFeaturedMod(@NotNull String userId, int page, FeaturedMod featuredMod) {
+        log.debug("Searching for games played by user id: {}", userId);
+        ElideRouteBuilder<GamePlayerStats> routeBuilder = ElideRouteBuilder.of(GamePlayerStats.class)
+                .addInclude("game")
+                .addInclude("player")
+                .addInclude("game.host")
+                .addInclude("game.featuredMod")
+                .addInclude("game.mapVersion")
+                .addInclude("game.mapVersion.map")
+                .sort("scoreTime", false);
+        if (featuredMod != null) {
+            routeBuilder.filter(ElideRouteBuilder.qBuilder().string("game.featuredMod.technicalName").eq(featuredMod.getTechnicalName())
+                    .and().string("player.id").eq(userId));
+        } else {
+            routeBuilder.filter(ElideRouteBuilder.qBuilder().string("player.id").eq(userId));
+        }
+        return fafApi.getPage(routeBuilder, 100, page, Collections.emptyMap());
+    }
+
+    public List<GamePlayerStats> getLastHunderedPlayedGames(@NotNull String userId, int page) {
+        return getLastHunderedPlayedGamesByFeaturedMod(userId, page, null);
+    }
+
+    public List<FeaturedMod> getFeaturedMods() {
+        ElideRouteBuilder<FeaturedMod> routeBuilder = ElideRouteBuilder.of(FeaturedMod.class);
+        return fafApi.getAll(routeBuilder);
+    }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index fd0ad0c..91db3db 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -9,6 +9,8 @@
 import com.faforever.moderatorclient.mapstruct.PlayerMapper;
 import com.faforever.moderatorclient.ui.domain.MapFX;
 import com.faforever.moderatorclient.ui.domain.MapVersionFX;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
@@ -17,6 +19,7 @@
 import javafx.scene.image.ImageView;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
+import javafx.util.StringConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
@@ -25,6 +28,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Component
 @Slf4j
@@ -91,6 +96,11 @@ public class MainController implements Controller<TabPane> {
     // Tab "Recent activity"
     public TableView<Player> userRegistrationFeedTableView;
     public TableView<Teamkill> teamkillFeedTableView;
+    public TableView<GamePlayerStats> userLastGamesTable;
+    public ChoiceBox<FeaturedMod> featuredModFilterChoiceBox;
+    public Button loadMoreGamesButton;
+    private Runnable loadMoreGamesRunnable;
+    private AtomicInteger page;
 
     public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService) {
         this.mapMapper = mapMapper;
@@ -120,6 +130,34 @@ private void initUserManagementTab() {
         ViewHelper.buildUserTableView(userSearchTableView);
         ViewHelper.buildNameHistoryTableView(userNameHistoryTableView);
         ViewHelper.buildBanTableView(userBansTableView);
+        ViewHelper.buildPlayersGamesTable(userLastGamesTable);
+
+        loadMoreGamesButton.visibleProperty()
+                .bind(Bindings.createBooleanBinding(() -> {
+                    return userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0;
+                }, userLastGamesTable.getItems()));
+
+        featuredModFilterChoiceBox.setConverter(new StringConverter<FeaturedMod>() {
+            @Override
+            public String toString(FeaturedMod object) {
+                return object == null ? "All" : object.getDisplayName();
+            }
+
+            @Override
+            public FeaturedMod fromString(String string) {
+                throw (new UnsupportedOperationException("Not implemented"));
+            }
+        });
+        featuredModFilterChoiceBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            userLastGamesTable.getItems().clear();
+            loadMoreGamesRunnable.run();
+        });
+
+        featuredModFilterChoiceBox.getItems().add(null);
+        featuredModFilterChoiceBox.getSelectionModel().select(0);
+        CompletableFuture.supplyAsync(userService::getFeaturedMods)
+                .thenAccept(featuredMods -> Platform.runLater(() -> featuredModFilterChoiceBox.getItems().addAll(featuredMods)));
+
         ViewHelper.buildTeamkillTableView(userTeamkillsTableView, false);
         ViewHelper.buildUserAvatarsTableView(userAvatarsTableView);
 
@@ -245,12 +283,19 @@ private void onSelectedUser(ObservableValue<? extends Player> observable, Player
         userTeamkillsTableView.getSortOrder().clear();
         userAvatarsTableView.getItems().clear();
         userAvatarsTableView.getSortOrder().clear();
+        userLastGamesTable.getItems().clear();
+        userLastGamesTable.getSortOrder().clear();
 
         if (newValue != null) {
             userNameHistoryTableView.getItems().addAll(newValue.getNames());
             userBansTableView.getItems().addAll(newValue.getBans());
             userTeamkillsTableView.getItems().addAll(userService.findTeamkillsByUserId(newValue.getId()));
             userAvatarsTableView.getItems().addAll(newValue.getAvatarAssignments());
+
+            page = new AtomicInteger(1);
+            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> userService.getLastHunderedPlayedGamesByFeaturedMod(newValue.getId(), page.get(), featuredModFilterChoiceBox.getSelectionModel().getSelectedItem()))
+                    .thenAccept(gamePlayerStats -> Platform.runLater(() -> userLastGamesTable.getItems().addAll(gamePlayerStats)));
+            loadMoreGamesRunnable.run();
         }
 
         newBanButton.setDisable(newValue == null);
@@ -389,4 +434,9 @@ public void onToggleMapVersionRanking() {
         mapVersion.setRanked(!mapVersion.isRanked());
         mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
     }
+
+    public void loadMoreGames() {
+        page.incrementAndGet();
+        loadMoreGamesRunnable.run();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index 6507877..11098d7 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -4,11 +4,11 @@
 import com.faforever.moderatorclient.ui.domain.MapFX;
 import com.faforever.moderatorclient.ui.domain.MapVersionFX;
 import com.faforever.moderatorclient.ui.domain.PlayerFX;
+import com.faforever.moderatorclient.utils.Tools;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.control.cell.TreeItemPropertyValueFactory;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -19,8 +19,12 @@
 import java.net.URL;
 import java.text.MessageFormat;
 import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.Comparator;
+import java.util.Locale;
 import java.util.Optional;
+import java.util.TimeZone;
 import java.util.stream.Stream;
 
 class ViewHelper {
@@ -83,7 +87,6 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
         tableView.getColumns().add(idColumn);
 
         TableColumn<AvatarAssignment, String> userIdColumn = new TableColumn<>("User ID");
-        userIdColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         userIdColumn.setCellValueFactory(param -> new SimpleObjectProperty<>(
                 Optional.ofNullable(param.getValue())
                         .map(avatarAssignment -> avatarAssignment.getPlayer().getId())
@@ -91,7 +94,7 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
         );
         userIdColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
         userIdColumn.setMinWidth(50);
-        idColumn.setEditable(true);
+        idColumn.setEditable(false);
         tableView.getColumns().add(userIdColumn);
 
         TableColumn<AvatarAssignment, String> userNameColumn = new TableColumn<>("User name");
@@ -459,6 +462,74 @@ protected void updateItem(PlayerFX item, boolean empty) {
         tableView.getColumns().add(updateTimeColumn);
     }
 
+    static void buildPlayersGamesTable(TableView<GamePlayerStats> tableView) {
+        TableColumn<GamePlayerStats, String> gameIdColum = new TableColumn<>("Game ID");
+        gameIdColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
+                param.getValue().getReplay().getId()
+        ));
+        gameIdColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        gameIdColum.setMinWidth(100);
+        tableView.getColumns().add(gameIdColum);
+
+        TableColumn<GamePlayerStats, String> gameNameColum = new TableColumn<>("Game Name");
+        gameNameColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
+                param.getValue().getReplay().getName()
+        ));
+        gameNameColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        gameNameColum.setMinWidth(100);
+        tableView.getColumns().add(gameNameColum);
+
+        TableColumn<GamePlayerStats, String> rankedColum = new TableColumn<>("Game Validity");
+        rankedColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
+                param.getValue().getReplay().getValidity().name()
+        ));
+        rankedColum.setComparator(Comparator.naturalOrder());
+        rankedColum.setMinWidth(120);
+        tableView.getColumns().add(rankedColum);
+
+        TableColumn<GamePlayerStats, String> beforeGameRatingColum = new TableColumn<>("Rating Before Game");
+        beforeGameRatingColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
+                String.valueOf(Tools.calculateRating(param.getValue().getBeforeMean(), param.getValue().getBeforeDeviation()))
+        ));
+        beforeGameRatingColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        beforeGameRatingColum.setMinWidth(150);
+        tableView.getColumns().add(beforeGameRatingColum);
+
+        TableColumn<GamePlayerStats, String> afterGameRatingColum = new TableColumn<>("Rating Change");
+        afterGameRatingColum.setCellValueFactory(param -> {
+            long afterRating = Tools.calculateRating(param.getValue().getAfterMean(), param.getValue().getAfterDeviation());
+            long beforeRating = Tools.calculateRating(param.getValue().getBeforeMean(), param.getValue().getBeforeDeviation());
+            return new SimpleObjectProperty<>(
+                    String.valueOf(String.format("%+d", (afterRating - beforeRating)))
+            );
+        });
+        afterGameRatingColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        afterGameRatingColum.setMinWidth(100);
+        tableView.getColumns().add(afterGameRatingColum);
+
+        TableColumn<GamePlayerStats, OffsetDateTime> scoreTimeDate = new TableColumn<>("Rating Before Game");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
+                .withLocale(Locale.getDefault())
+                .withZone(TimeZone.getDefault().toZoneId());
+        scoreTimeDate.setCellValueFactory(param ->
+                new SimpleObjectProperty<>(param.getValue().getScoreTime())
+        );
+        scoreTimeDate.setCellFactory(param -> new TableCell<GamePlayerStats, OffsetDateTime>() {
+            @Override
+            protected void updateItem(OffsetDateTime item, boolean empty) {
+                super.updateItem(item, empty);
+                if (!empty && item != null) {
+                    setGraphic(new Label(item.format(dateTimeFormatter)));
+                } else {
+                    setGraphic(new Label("Unknown date"));
+                }
+            }
+        });
+        scoreTimeDate.setComparator(Comparator.naturalOrder());
+        scoreTimeDate.setMinWidth(150);
+        tableView.getColumns().add(scoreTimeDate);
+    }
+
     static void buildMapVersionTableView(TableView<MapVersionFX> tableView) {
         TableColumn<MapVersionFX, String> idColumn = new TableColumn<>("Version ID");
         idColumn.setCellValueFactory(o -> o.getValue().idProperty());
diff --git a/src/main/java/com/faforever/moderatorclient/utils/Tools.java b/src/main/java/com/faforever/moderatorclient/utils/Tools.java
new file mode 100644
index 0000000..3b2c303
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/utils/Tools.java
@@ -0,0 +1,11 @@
+package com.faforever.moderatorclient.utils;
+
+public class Tools {
+    public static long calculateRating(double mean, double deviation) {
+        return Math.round(mean - 3 * deviation);
+    }
+
+    public static long calculateRoundedRating(double mean, double deviation) {
+        return Math.round(calculateRating(mean, deviation) / 100d) * 100;
+    }
+}
diff --git a/src/main/resources/ui/mainWindow.fxml b/src/main/resources/ui/mainWindow.fxml
index 3e5460a..d4be1f0 100644
--- a/src/main/resources/ui/mainWindow.fxml
+++ b/src/main/resources/ui/mainWindow.fxml
@@ -129,6 +129,20 @@
                                                    maxWidth="1.7976931348623157E308" prefHeight="200.0"/>
                                     </content>
                                 </Tab>
+                                <Tab text="Last Games">
+                                    <content>
+                                        <VBox>
+                                            <HBox spacing="10">
+                                                <Label text="Show featured Mods:"/>
+                                                <ChoiceBox fx:id="featuredModFilterChoiceBox"/>
+                                                <Button fx:id="loadMoreGamesButton" text="Load more"
+                                                        onAction="#loadMoreGames"/>
+                                            </HBox>
+                                            <TableView fx:id="userLastGamesTable" maxHeight="1.7976931348623157E308"
+                                                       maxWidth="1.7976931348623157E308" VBox.vgrow="ALWAYS"/>
+                                        </VBox>
+                                    </content>
+                                </Tab>
                                 <Tab text="Avatars">
                                     <content>
                                         <TableView fx:id="userAvatarsTableView" prefHeight="200.0" prefWidth="200.0"/>

From 1de646732c6ec8d692aba43e988a7136fb4d6cb9 Mon Sep 17 00:00:00 2001
From: axel1200 <alexander.von.trostorff@gmail.com>
Date: Sun, 26 Nov 2017 23:50:31 +0100
Subject: [PATCH 04/14] Adds Project settings and fix gitignore

---
 .gitignore          | 31 +++++++++++++++----------------
 .idea/compiler.xml  | 20 ++++++++++++++++++++
 .idea/encodings.xml |  6 ++++++
 .idea/misc.xml      | 11 +++++++++++
 .idea/modules.xml   |  8 ++++++++
 .idea/vcs.xml       |  6 ++++++
 6 files changed, 66 insertions(+), 16 deletions(-)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 2af7cef..6074e13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,23 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
 
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
 ### IntelliJ IDEA ###
-.idea
 *.iws
 *.iml
 *.ipr
 
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
\ No newline at end of file
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/sonarIssues.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/inspectionProfiles/
+.idea/libraries
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..981963d
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="faf-moderator-client" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="faf-moderator-client" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-Amapstruct.defaultComponentModel=jsr330" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..b26911b
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..1c1e70f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..b7ffb3d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/faf-moderator-client.iml" filepath="$PROJECT_DIR$/.idea/faf-moderator-client.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 11ad8915a0600642a6622c751814dd9b4309cb04 Mon Sep 17 00:00:00 2001
From: axel1200 <alexander.von.trostorff@gmail.com>
Date: Mon, 27 Nov 2017 01:35:30 +0100
Subject: [PATCH 05/14] mapping

---
 .../api/dto/GamePlayerStats.java              |   2 +-
 .../api/rest/domain/UserService.java          |  25 +-
 .../mapstruct/FeaturedModMapper.java          |  16 ++
 .../moderatorclient/mapstruct/GameMapper.java |  18 ++
 .../mapstruct/GamePlayerStatsMapper.java      |  21 ++
 .../mapstruct/JavaFXMapper.java               |   8 +
 .../mapstruct/MapVersionMapper.java           |   2 +-
 .../moderatorclient/ui/MainController.java    |  12 +-
 .../moderatorclient/ui/ViewHelper.java        |  47 ++--
 .../ui/domain/FeaturedModFX.java              | 135 +++++++++
 .../moderatorclient/ui/domain/GameFX.java     | 157 +++++++++++
 .../ui/domain/GamePlayerStatsFX.java          | 257 ++++++++++++++++++
 .../moderatorclient/utils/Tools.java          |  11 -
 13 files changed, 654 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/FeaturedModFX.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java
 delete mode 100644 src/main/java/com/faforever/moderatorclient/utils/Tools.java

diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java b/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java
index 0f368ee..4636794 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java
@@ -31,7 +31,7 @@ public class GamePlayerStats {
     private OffsetDateTime scoreTime;
 
     @Relationship("game")
-    private Game replay;
+    private Game game;
 
     @Relationship("player")
     private Player player;
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
index 0addc23..31c0b3a 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
@@ -3,6 +3,10 @@
 import com.faforever.moderatorclient.api.dto.*;
 import com.faforever.moderatorclient.api.rest.ElideRouteBuilder;
 import com.faforever.moderatorclient.api.rest.FafApiCommunicationService;
+import com.faforever.moderatorclient.mapstruct.FeaturedModMapper;
+import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
+import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
+import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -16,9 +20,14 @@
 @Slf4j
 public class UserService {
     private final FafApiCommunicationService fafApi;
+    private final GamePlayerStatsMapper gamePlayerStatsMapper;
+    private final FeaturedModMapper featuredModMapper;
 
-    public UserService(FafApiCommunicationService fafApi) {
+
+    public UserService(FafApiCommunicationService fafApi, GamePlayerStatsMapper gamePlayerStatsMapper, FeaturedModMapper featuredModMapper) {
         this.fafApi = fafApi;
+        this.gamePlayerStatsMapper = gamePlayerStatsMapper;
+        this.featuredModMapper = featuredModMapper;
     }
 
     private ElideRouteBuilder addModeratorIncludes(@NotNull ElideRouteBuilder builder) {
@@ -145,7 +154,7 @@ public BanInfo createBan(@NotNull BanInfo banInfo) {
         return fafApi.post(ElideRouteBuilder.of(BanInfo.class), banInfo);
     }
 
-    public List<GamePlayerStats> getLastHunderedPlayedGamesByFeaturedMod(@NotNull String userId, int page, FeaturedMod featuredMod) {
+    public List<GamePlayerStatsFX> getLastHunderedPlayedGamesByFeaturedMod(@NotNull String userId, int page, FeaturedModFX featuredModFX) {
         log.debug("Searching for games played by user id: {}", userId);
         ElideRouteBuilder<GamePlayerStats> routeBuilder = ElideRouteBuilder.of(GamePlayerStats.class)
                 .addInclude("game")
@@ -155,21 +164,21 @@ public List<GamePlayerStats> getLastHunderedPlayedGamesByFeaturedMod(@NotNull St
                 .addInclude("game.mapVersion")
                 .addInclude("game.mapVersion.map")
                 .sort("scoreTime", false);
-        if (featuredMod != null) {
-            routeBuilder.filter(ElideRouteBuilder.qBuilder().string("game.featuredMod.technicalName").eq(featuredMod.getTechnicalName())
+        if (featuredModFX != null) {
+            routeBuilder.filter(ElideRouteBuilder.qBuilder().string("game.featuredMod.technicalName").eq(featuredModFX.getTechnicalName())
                     .and().string("player.id").eq(userId));
         } else {
             routeBuilder.filter(ElideRouteBuilder.qBuilder().string("player.id").eq(userId));
         }
-        return fafApi.getPage(routeBuilder, 100, page, Collections.emptyMap());
+        return gamePlayerStatsMapper.map(fafApi.getPage(routeBuilder, 100, page, Collections.emptyMap()));
     }
 
-    public List<GamePlayerStats> getLastHunderedPlayedGames(@NotNull String userId, int page) {
+    public List<GamePlayerStatsFX> getLastHunderedPlayedGames(@NotNull String userId, int page) {
         return getLastHunderedPlayedGamesByFeaturedMod(userId, page, null);
     }
 
-    public List<FeaturedMod> getFeaturedMods() {
+    public List<FeaturedModFX> getFeaturedMods() {
         ElideRouteBuilder<FeaturedMod> routeBuilder = ElideRouteBuilder.of(FeaturedMod.class);
-        return fafApi.getAll(routeBuilder);
+        return featuredModMapper.map(fafApi.getAll(routeBuilder));
     }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java
new file mode 100644
index 0000000..e3c31f1
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java
@@ -0,0 +1,16 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.FeaturedMod;
+import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(uses = JavaFXMapper.class)
+public abstract class FeaturedModMapper {
+    public abstract FeaturedModFX map(FeaturedMod featuredMod);
+
+    public abstract FeaturedMod map(FeaturedModFX featuredModFX);
+
+    public abstract List<FeaturedModFX> map(List<FeaturedMod> featuredMods);
+}
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java
new file mode 100644
index 0000000..5bbd9c5
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java
@@ -0,0 +1,18 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.Game;
+import com.faforever.moderatorclient.ui.domain.GameFX;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.List;
+
+@Mapper(uses = {JavaFXMapper.class, PlayerMapper.class, FeaturedModMapper.class, MapVersionMapper.class})
+public abstract class GameMapper {
+    @Mapping(target = "reviews", ignore = true)
+    public abstract GameFX map(Game game);
+
+    public abstract Game map(GameFX gameFX);
+
+    public abstract List<GameFX> map(List<Game> games);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
new file mode 100644
index 0000000..e1964e8
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
@@ -0,0 +1,21 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.GamePlayerStats;
+import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.List;
+
+@Mapper(uses = {JavaFXMapper.class, GameMapper.class, PlayerMapper.class})
+public abstract class GamePlayerStatsMapper {
+
+    public abstract GamePlayerStatsFX map(GamePlayerStats gamePlayerStats);
+
+    @Mapping(target = "beforeRating", ignore = true)
+    @Mapping(target = "afterRating", ignore = true)
+    @Mapping(target = "ratingChange", ignore = true)
+    public abstract GamePlayerStats map(GamePlayerStatsFX gamePlayerStatsFX);
+
+    public abstract List<GamePlayerStatsFX> map(List<GamePlayerStats> gamePlayerStats);
+}
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java
index 68dc847..15968a7 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/JavaFXMapper.java
@@ -1,8 +1,12 @@
 package com.faforever.moderatorclient.mapstruct;
 
 import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class JavaFXMapper {
     public BooleanProperty map(Boolean value) {
@@ -37,6 +41,10 @@ public <T> T map(ObjectProperty<T> value) {
         return value.get();
     }
 
+    public <T> ObservableList<T> map(List<T> value) {
+        return FXCollections.observableList(value);
+    }
+
 //    public <T> ListProperty<T> mapListToListProperty (List<T> value) {
 //        return new SimpleListProperty<>(FXCollections.observableList(value));
 //    }
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
index c0e8b14..b951d1d 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
@@ -17,5 +17,5 @@ public interface MapVersionMapper {
 
     List<MapVersionFX> mapToFX(List<MapVersion> mapVersionList);
 
-    List<MapVersion> mapToDTo(List<MapVersionFX> mapVersionFXList);
+    List<MapVersion> mapToDTO(List<MapVersionFX> mapVersionFXList);
 }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index 91db3db..14ae7ce 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -7,6 +7,8 @@
 import com.faforever.moderatorclient.mapstruct.MapMapper;
 import com.faforever.moderatorclient.mapstruct.MapVersionMapper;
 import com.faforever.moderatorclient.mapstruct.PlayerMapper;
+import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
+import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
 import com.faforever.moderatorclient.ui.domain.MapFX;
 import com.faforever.moderatorclient.ui.domain.MapVersionFX;
 import javafx.application.Platform;
@@ -96,8 +98,8 @@ public class MainController implements Controller<TabPane> {
     // Tab "Recent activity"
     public TableView<Player> userRegistrationFeedTableView;
     public TableView<Teamkill> teamkillFeedTableView;
-    public TableView<GamePlayerStats> userLastGamesTable;
-    public ChoiceBox<FeaturedMod> featuredModFilterChoiceBox;
+    public TableView<GamePlayerStatsFX> userLastGamesTable;
+    public ChoiceBox<FeaturedModFX> featuredModFilterChoiceBox;
     public Button loadMoreGamesButton;
     private Runnable loadMoreGamesRunnable;
     private AtomicInteger page;
@@ -137,14 +139,14 @@ private void initUserManagementTab() {
                     return userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0;
                 }, userLastGamesTable.getItems()));
 
-        featuredModFilterChoiceBox.setConverter(new StringConverter<FeaturedMod>() {
+        featuredModFilterChoiceBox.setConverter(new StringConverter<FeaturedModFX>() {
             @Override
-            public String toString(FeaturedMod object) {
+            public String toString(FeaturedModFX object) {
                 return object == null ? "All" : object.getDisplayName();
             }
 
             @Override
-            public FeaturedMod fromString(String string) {
+            public FeaturedModFX fromString(String string) {
                 throw (new UnsupportedOperationException("Not implemented"));
             }
         });
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index 11098d7..221788f 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -1,10 +1,10 @@
 package com.faforever.moderatorclient.ui;
 
 import com.faforever.moderatorclient.api.dto.*;
+import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
 import com.faforever.moderatorclient.ui.domain.MapFX;
 import com.faforever.moderatorclient.ui.domain.MapVersionFX;
 import com.faforever.moderatorclient.ui.domain.PlayerFX;
-import com.faforever.moderatorclient.utils.Tools;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxTableCell;
@@ -462,59 +462,44 @@ protected void updateItem(PlayerFX item, boolean empty) {
         tableView.getColumns().add(updateTimeColumn);
     }
 
-    static void buildPlayersGamesTable(TableView<GamePlayerStats> tableView) {
-        TableColumn<GamePlayerStats, String> gameIdColum = new TableColumn<>("Game ID");
-        gameIdColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
-                param.getValue().getReplay().getId()
-        ));
+    static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView) {
+        TableColumn<GamePlayerStatsFX, String> gameIdColum = new TableColumn<>("Game ID");
+        gameIdColum.setCellValueFactory(param -> param.getValue().getGame().idProperty());
         gameIdColum.setComparator(Comparator.comparingInt(Integer::parseInt));
         gameIdColum.setMinWidth(100);
         tableView.getColumns().add(gameIdColum);
 
-        TableColumn<GamePlayerStats, String> gameNameColum = new TableColumn<>("Game Name");
-        gameNameColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
-                param.getValue().getReplay().getName()
-        ));
-        gameNameColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        TableColumn<GamePlayerStatsFX, String> gameNameColum = new TableColumn<>("Game Name");
+        gameNameColum.setCellValueFactory(o -> o.getValue().getGame().nameProperty());
         gameNameColum.setMinWidth(100);
         tableView.getColumns().add(gameNameColum);
 
-        TableColumn<GamePlayerStats, String> rankedColum = new TableColumn<>("Game Validity");
+        TableColumn<GamePlayerStatsFX, String> rankedColum = new TableColumn<>("Game Validity");
         rankedColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
-                param.getValue().getReplay().getValidity().name()
+                param.getValue().getGame().getValidity().name()
         ));
         rankedColum.setComparator(Comparator.naturalOrder());
         rankedColum.setMinWidth(120);
         tableView.getColumns().add(rankedColum);
 
-        TableColumn<GamePlayerStats, String> beforeGameRatingColum = new TableColumn<>("Rating Before Game");
-        beforeGameRatingColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
-                String.valueOf(Tools.calculateRating(param.getValue().getBeforeMean(), param.getValue().getBeforeDeviation()))
-        ));
-        beforeGameRatingColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        TableColumn<GamePlayerStatsFX, Number> beforeGameRatingColum = new TableColumn<>("Rating Before Game");
+        beforeGameRatingColum.setCellValueFactory(o -> o.getValue().beforeRatingProperty());
         beforeGameRatingColum.setMinWidth(150);
         tableView.getColumns().add(beforeGameRatingColum);
 
-        TableColumn<GamePlayerStats, String> afterGameRatingColum = new TableColumn<>("Rating Change");
-        afterGameRatingColum.setCellValueFactory(param -> {
-            long afterRating = Tools.calculateRating(param.getValue().getAfterMean(), param.getValue().getAfterDeviation());
-            long beforeRating = Tools.calculateRating(param.getValue().getBeforeMean(), param.getValue().getBeforeDeviation());
-            return new SimpleObjectProperty<>(
-                    String.valueOf(String.format("%+d", (afterRating - beforeRating)))
-            );
-        });
-        afterGameRatingColum.setComparator(Comparator.comparingInt(Integer::parseInt));
+        TableColumn<GamePlayerStatsFX, Number> afterGameRatingColum = new TableColumn<>("Rating Change");
+        afterGameRatingColum.setCellValueFactory(o -> o.getValue().ratingChangeProperty());
         afterGameRatingColum.setMinWidth(100);
         tableView.getColumns().add(afterGameRatingColum);
 
-        TableColumn<GamePlayerStats, OffsetDateTime> scoreTimeDate = new TableColumn<>("Rating Before Game");
+        TableColumn<GamePlayerStatsFX, OffsetDateTime> scoreTimeDate = new TableColumn<>("Score Time");
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
                 .withLocale(Locale.getDefault())
                 .withZone(TimeZone.getDefault().toZoneId());
-        scoreTimeDate.setCellValueFactory(param ->
-                new SimpleObjectProperty<>(param.getValue().getScoreTime())
+        scoreTimeDate.setCellValueFactory(o ->
+                o.getValue().scoreTimeProperty()
         );
-        scoreTimeDate.setCellFactory(param -> new TableCell<GamePlayerStats, OffsetDateTime>() {
+        scoreTimeDate.setCellFactory(param -> new TableCell<GamePlayerStatsFX, OffsetDateTime>() {
             @Override
             protected void updateItem(OffsetDateTime item, boolean empty) {
                 super.updateItem(item, empty);
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/FeaturedModFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/FeaturedModFX.java
new file mode 100644
index 0000000..bb4f448
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/FeaturedModFX.java
@@ -0,0 +1,135 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import javafx.beans.property.*;
+
+public class FeaturedModFX {
+    private final StringProperty id;
+    private final StringProperty description;
+    private final StringProperty displayName;
+    private final IntegerProperty order;
+    private final StringProperty gitBranch;
+    private final StringProperty gitUrl;
+    private final StringProperty bireusUrl;
+    private final StringProperty technicalName;
+    private final BooleanProperty visible;
+
+    public FeaturedModFX() {
+        this.id = new SimpleStringProperty();
+        this.description = new SimpleStringProperty();
+        this.displayName = new SimpleStringProperty();
+        this.order = new SimpleIntegerProperty();
+        this.gitBranch = new SimpleStringProperty();
+        this.gitUrl = new SimpleStringProperty();
+        this.bireusUrl = new SimpleStringProperty();
+        this.technicalName = new SimpleStringProperty();
+        this.visible = new SimpleBooleanProperty();
+    }
+
+    public String getId() {
+        return id.get();
+    }
+
+    public void setId(String id) {
+        this.id.set(id);
+    }
+
+    public StringProperty idProperty() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    public void setDescription(String description) {
+        this.description.set(description);
+    }
+
+    public StringProperty descriptionProperty() {
+        return description;
+    }
+
+    public String getDisplayName() {
+        return displayName.get();
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName.set(displayName);
+    }
+
+    public StringProperty displayNameProperty() {
+        return displayName;
+    }
+
+    public int getOrder() {
+        return order.get();
+    }
+
+    public void setOrder(int order) {
+        this.order.set(order);
+    }
+
+    public IntegerProperty orderProperty() {
+        return order;
+    }
+
+    public String getGitBranch() {
+        return gitBranch.get();
+    }
+
+    public void setGitBranch(String gitBranch) {
+        this.gitBranch.set(gitBranch);
+    }
+
+    public StringProperty gitBranchProperty() {
+        return gitBranch;
+    }
+
+    public String getGitUrl() {
+        return gitUrl.get();
+    }
+
+    public void setGitUrl(String gitUrl) {
+        this.gitUrl.set(gitUrl);
+    }
+
+    public StringProperty gitUrlProperty() {
+        return gitUrl;
+    }
+
+    public String getBireusUrl() {
+        return bireusUrl.get();
+    }
+
+    public void setBireusUrl(String bireusUrl) {
+        this.bireusUrl.set(bireusUrl);
+    }
+
+    public StringProperty bireusUrlProperty() {
+        return bireusUrl;
+    }
+
+    public String getTechnicalName() {
+        return technicalName.get();
+    }
+
+    public void setTechnicalName(String technicalName) {
+        this.technicalName.set(technicalName);
+    }
+
+    public StringProperty technicalNameProperty() {
+        return technicalName;
+    }
+
+    public boolean isVisible() {
+        return visible.get();
+    }
+
+    public void setVisible(boolean visible) {
+        this.visible.set(visible);
+    }
+
+    public BooleanProperty visibleProperty() {
+        return visible;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
new file mode 100644
index 0000000..41b851c
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
@@ -0,0 +1,157 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import com.faforever.moderatorclient.api.dto.*;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.time.OffsetDateTime;
+
+public class GameFX extends AbstractEntityFX {
+    private final StringProperty id;
+    private final StringProperty name;
+    private final ObjectProperty<OffsetDateTime> startTime;
+    private final ObjectProperty<OffsetDateTime> endTime;
+    private final ObjectProperty<Validity> validity;
+    private final ObjectProperty<VictoryCondition> victoryCondition;
+    private final ObservableList<GameReview> reviews;
+    private final ObservableList<GamePlayerStats> playerStats;
+    private final ObjectProperty<Player> host;
+    private final ObjectProperty<FeaturedMod> featuredMod;
+    private final ObjectProperty<MapVersion> mapVersion;
+
+    public GameFX() {
+        this.id = new SimpleStringProperty();
+        this.name = new SimpleStringProperty();
+        this.startTime = new SimpleObjectProperty<>();
+        this.endTime = new SimpleObjectProperty<>();
+        this.validity = new SimpleObjectProperty<>();
+        this.victoryCondition = new SimpleObjectProperty<>();
+        this.reviews = FXCollections.observableArrayList();
+        this.playerStats = FXCollections.observableArrayList();
+        this.host = new SimpleObjectProperty<>();
+        this.featuredMod = new SimpleObjectProperty<>();
+        this.mapVersion = new SimpleObjectProperty<>();
+    }
+
+    @Override
+    public String getId() {
+        return id.get();
+    }
+
+    public void setId(String id) {
+        this.id.set(id);
+    }
+
+    @Override
+    public StringProperty idProperty() {
+        return id;
+    }
+
+    public String getName() {
+        return name.get();
+    }
+
+    public void setName(String name) {
+        this.name.set(name);
+    }
+
+    public StringProperty nameProperty() {
+        return name;
+    }
+
+    public OffsetDateTime getStartTime() {
+        return startTime.get();
+    }
+
+    public void setStartTime(OffsetDateTime startTime) {
+        this.startTime.set(startTime);
+    }
+
+    public ObjectProperty<OffsetDateTime> startTimeProperty() {
+        return startTime;
+    }
+
+    public OffsetDateTime getEndTime() {
+        return endTime.get();
+    }
+
+    public void setEndTime(OffsetDateTime endTime) {
+        this.endTime.set(endTime);
+    }
+
+    public ObjectProperty<OffsetDateTime> endTimeProperty() {
+        return endTime;
+    }
+
+    public Validity getValidity() {
+        return validity.get();
+    }
+
+    public void setValidity(Validity validity) {
+        this.validity.set(validity);
+    }
+
+    public ObjectProperty<Validity> validityProperty() {
+        return validity;
+    }
+
+    public VictoryCondition getVictoryCondition() {
+        return victoryCondition.get();
+    }
+
+    public void setVictoryCondition(VictoryCondition victoryCondition) {
+        this.victoryCondition.set(victoryCondition);
+    }
+
+    public ObjectProperty<VictoryCondition> victoryConditionProperty() {
+        return victoryCondition;
+    }
+
+    public ObservableList<GameReview> getReviews() {
+        return reviews;
+    }
+
+    public ObservableList<GamePlayerStats> getPlayerStats() {
+        return playerStats;
+    }
+
+    public Player getHost() {
+        return host.get();
+    }
+
+    public void setHost(Player host) {
+        this.host.set(host);
+    }
+
+    public ObjectProperty<Player> hostProperty() {
+        return host;
+    }
+
+    public FeaturedMod getFeaturedMod() {
+        return featuredMod.get();
+    }
+
+    public void setFeaturedMod(FeaturedMod featuredMod) {
+        this.featuredMod.set(featuredMod);
+    }
+
+    public ObjectProperty<FeaturedMod> featuredModProperty() {
+        return featuredMod;
+    }
+
+    public MapVersion getMapVersion() {
+        return mapVersion.get();
+    }
+
+    public void setMapVersion(MapVersion mapVersion) {
+        this.mapVersion.set(mapVersion);
+    }
+
+    public ObjectProperty<MapVersion> mapVersionProperty() {
+        return mapVersion;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java
new file mode 100644
index 0000000..adff811
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java
@@ -0,0 +1,257 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import com.faforever.moderatorclient.api.dto.Faction;
+import com.faforever.moderatorclient.api.dto.Player;
+import javafx.beans.property.*;
+
+import java.time.OffsetDateTime;
+
+public class GamePlayerStatsFX extends AbstractEntityFX {
+    private final StringProperty id;
+    private final BooleanProperty ai;
+    private final ObjectProperty<Faction> faction;
+    private final ObjectProperty<Byte> color;
+    private final ObjectProperty<Byte> team;
+    private final ObjectProperty<Byte> startSpot;
+    private final FloatProperty beforeMean;
+    private final FloatProperty beforeDeviation;
+    private final FloatProperty afterMean;
+    private final FloatProperty afterDeviation;
+    private final ObjectProperty<Byte> score;
+    private final ObjectProperty<OffsetDateTime> scoreTime;
+    private final ObjectProperty<GameFX> game;
+    private final ObjectProperty<Player> player;
+    private final IntegerProperty ratingChange;
+    private final IntegerProperty beforeRating;
+    private final IntegerProperty afterRating;
+
+
+    public GamePlayerStatsFX() {
+        id = new SimpleStringProperty();
+        ai = new SimpleBooleanProperty();
+        faction = new SimpleObjectProperty<>();
+        color = new SimpleObjectProperty<>();
+        team = new SimpleObjectProperty<>();
+        startSpot = new SimpleObjectProperty<>();
+        beforeMean = new SimpleFloatProperty();
+        beforeDeviation = new SimpleFloatProperty();
+        afterMean = new SimpleFloatProperty();
+        afterDeviation = new SimpleFloatProperty();
+        score = new SimpleObjectProperty<>();
+        scoreTime = new SimpleObjectProperty<>();
+        game = new SimpleObjectProperty<>();
+        player = new SimpleObjectProperty<>();
+        ratingChange = new SimpleIntegerProperty();
+        beforeRating = new SimpleIntegerProperty();
+        afterRating = new SimpleIntegerProperty();
+        beforeRating.bind(beforeMean.subtract(beforeDeviation.multiply(3)));
+        afterRating.bind(afterMean.subtract(afterDeviation.multiply(3)));
+        ratingChange.bind(afterRating.subtract(beforeRating));
+    }
+
+    public int getBeforeRating() {
+        return beforeRating.get();
+    }
+
+    public void setBeforeRating(int beforeRating) {
+        this.beforeRating.set(beforeRating);
+    }
+
+    public IntegerProperty beforeRatingProperty() {
+        return beforeRating;
+    }
+
+    public int getAfterRating() {
+        return afterRating.get();
+    }
+
+    public void setAfterRating(int afterRating) {
+        this.afterRating.set(afterRating);
+    }
+
+    public IntegerProperty afterRatingProperty() {
+        return afterRating;
+    }
+
+    public int getRatingChange() {
+        return ratingChange.get();
+    }
+
+    public void setRatingChange(int ratingChange) {
+        this.ratingChange.set(ratingChange);
+    }
+
+    public IntegerProperty ratingChangeProperty() {
+        return ratingChange;
+    }
+
+    @Override
+    public String getId() {
+        return id.get();
+    }
+
+    public void setId(String id) {
+        this.id.set(id);
+    }
+
+    @Override
+    public StringProperty idProperty() {
+        return id;
+    }
+
+    public boolean isAi() {
+        return ai.get();
+    }
+
+    public void setAi(boolean ai) {
+        this.ai.set(ai);
+    }
+
+    public BooleanProperty aiProperty() {
+        return ai;
+    }
+
+    public Faction getFaction() {
+        return faction.get();
+    }
+
+    public void setFaction(Faction faction) {
+        this.faction.set(faction);
+    }
+
+    public ObjectProperty<Faction> factionProperty() {
+        return faction;
+    }
+
+    public Byte getColor() {
+        return color.get();
+    }
+
+    public void setColor(Byte color) {
+        this.color.set(color);
+    }
+
+    public ObjectProperty<Byte> colorProperty() {
+        return color;
+    }
+
+    public Byte getTeam() {
+        return team.get();
+    }
+
+    public void setTeam(Byte team) {
+        this.team.set(team);
+    }
+
+    public ObjectProperty<Byte> teamProperty() {
+        return team;
+    }
+
+    public Byte getStartSpot() {
+        return startSpot.get();
+    }
+
+    public void setStartSpot(Byte startSpot) {
+        this.startSpot.set(startSpot);
+    }
+
+    public ObjectProperty<Byte> startSpotProperty() {
+        return startSpot;
+    }
+
+    public float getBeforeMean() {
+        return beforeMean.get();
+    }
+
+    public void setBeforeMean(float beforeMean) {
+        this.beforeMean.set(beforeMean);
+    }
+
+    public FloatProperty beforeMeanProperty() {
+        return beforeMean;
+    }
+
+    public float getBeforeDeviation() {
+        return beforeDeviation.get();
+    }
+
+    public void setBeforeDeviation(float beforeDeviation) {
+        this.beforeDeviation.set(beforeDeviation);
+    }
+
+    public FloatProperty beforeDeviationProperty() {
+        return beforeDeviation;
+    }
+
+    public float getAfterMean() {
+        return afterMean.get();
+    }
+
+    public void setAfterMean(float afterMean) {
+        this.afterMean.set(afterMean);
+    }
+
+    public FloatProperty afterMeanProperty() {
+        return afterMean;
+    }
+
+    public float getAfterDeviation() {
+        return afterDeviation.get();
+    }
+
+    public void setAfterDeviation(float afterDeviation) {
+        this.afterDeviation.set(afterDeviation);
+    }
+
+    public FloatProperty afterDeviationProperty() {
+        return afterDeviation;
+    }
+
+    public Byte getScore() {
+        return score.get();
+    }
+
+    public void setScore(Byte score) {
+        this.score.set(score);
+    }
+
+    public ObjectProperty<Byte> scoreProperty() {
+        return score;
+    }
+
+    public OffsetDateTime getScoreTime() {
+        return scoreTime.get();
+    }
+
+    public void setScoreTime(OffsetDateTime scoreTime) {
+        this.scoreTime.set(scoreTime);
+    }
+
+    public ObjectProperty<OffsetDateTime> scoreTimeProperty() {
+        return scoreTime;
+    }
+
+    public GameFX getGame() {
+        return game.get();
+    }
+
+    public void setGame(GameFX game) {
+        this.game.set(game);
+    }
+
+    public ObjectProperty<GameFX> gameProperty() {
+        return game;
+    }
+
+    public Player getPlayer() {
+        return player.get();
+    }
+
+    public void setPlayer(Player player) {
+        this.player.set(player);
+    }
+
+    public ObjectProperty<Player> playerProperty() {
+        return player;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/utils/Tools.java b/src/main/java/com/faforever/moderatorclient/utils/Tools.java
deleted file mode 100644
index 3b2c303..0000000
--- a/src/main/java/com/faforever/moderatorclient/utils/Tools.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.faforever.moderatorclient.utils;
-
-public class Tools {
-    public static long calculateRating(double mean, double deviation) {
-        return Math.round(mean - 3 * deviation);
-    }
-
-    public static long calculateRoundedRating(double mean, double deviation) {
-        return Math.round(calculateRating(mean, deviation) / 100d) * 100;
-    }
-}

From 9070322edc2253c5ba8262aac222cd8d4833458a Mon Sep 17 00:00:00 2001
From: axel1200 <alexander.von.trostorff@gmail.com>
Date: Mon, 27 Nov 2017 22:09:40 +0100
Subject: [PATCH 06/14] all changes made Fixes #11

---
 .../FafModeratorClientApplication.java        | 10 +++--
 .../mapstruct/GamePlayerStatsMapper.java      |  4 +-
 .../moderatorclient/ui/MainController.java    | 25 ++++++------
 .../moderatorclient/ui/PlatformService.java   |  5 +++
 .../ui/PlatformServiceImpl.java               | 16 ++++++++
 .../moderatorclient/ui/ViewHelper.java        | 39 ++++++++++++++++---
 .../moderatorclient/ui/domain/GameFX.java     |  4 ++
 src/main/resources/application-dev.yml        |  5 ++-
 src/main/resources/application.yml            |  5 ++-
 9 files changed, 89 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/PlatformService.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/PlatformServiceImpl.java

diff --git a/src/main/java/com/faforever/moderatorclient/FafModeratorClientApplication.java b/src/main/java/com/faforever/moderatorclient/FafModeratorClientApplication.java
index bb57b40..df8eb17 100644
--- a/src/main/java/com/faforever/moderatorclient/FafModeratorClientApplication.java
+++ b/src/main/java/com/faforever/moderatorclient/FafModeratorClientApplication.java
@@ -1,8 +1,6 @@
 package com.faforever.moderatorclient;
 
-import com.faforever.moderatorclient.ui.MainController;
-import com.faforever.moderatorclient.ui.StageHolder;
-import com.faforever.moderatorclient.ui.UiService;
+import com.faforever.moderatorclient.ui.*;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -12,6 +10,7 @@
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication(exclude = {
         JmxAutoConfiguration.class,
@@ -44,4 +43,9 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.setScene(new Scene(mainController.getRoot()));
         primaryStage.show();
     }
+
+    @Bean
+    public PlatformService platformService() {
+        return new PlatformServiceImpl(getHostServices());
+    }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
index e1964e8..d7b5ab1 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
@@ -10,11 +10,11 @@
 @Mapper(uses = {JavaFXMapper.class, GameMapper.class, PlayerMapper.class})
 public abstract class GamePlayerStatsMapper {
 
-    public abstract GamePlayerStatsFX map(GamePlayerStats gamePlayerStats);
-
     @Mapping(target = "beforeRating", ignore = true)
     @Mapping(target = "afterRating", ignore = true)
     @Mapping(target = "ratingChange", ignore = true)
+    public abstract GamePlayerStatsFX map(GamePlayerStats gamePlayerStats);
+
     public abstract GamePlayerStats map(GamePlayerStatsFX gamePlayerStatsFX);
 
     public abstract List<GamePlayerStatsFX> map(List<GamePlayerStats> gamePlayerStats);
diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index 14ae7ce..40266e9 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -23,6 +23,7 @@
 import javafx.stage.StageStyle;
 import javafx.util.StringConverter;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
@@ -31,7 +32,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Component
 @Slf4j
@@ -102,9 +102,11 @@ public class MainController implements Controller<TabPane> {
     public ChoiceBox<FeaturedModFX> featuredModFilterChoiceBox;
     public Button loadMoreGamesButton;
     private Runnable loadMoreGamesRunnable;
-    private AtomicInteger page;
+    private int page = 1;
+    private final String replayDownLoadFormat;
+    private final PlatformService platformService;
 
-    public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService) {
+    public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService, @Value("${faforever.vault.replayDownloadUrlFormat}") String replayDownLoadFormat, PlatformService platformService) {
         this.mapMapper = mapMapper;
         this.mapVersionMapper = mapVersionMapper;
         this.playerMapper = playerMapper;
@@ -112,6 +114,8 @@ public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, Pl
         this.userService = userService;
         this.mapService = mapSearchService;
         this.avatarService = avatarService;
+        this.replayDownLoadFormat = replayDownLoadFormat;
+        this.platformService = platformService;
     }
 
     @Override
@@ -132,12 +136,10 @@ private void initUserManagementTab() {
         ViewHelper.buildUserTableView(userSearchTableView);
         ViewHelper.buildNameHistoryTableView(userNameHistoryTableView);
         ViewHelper.buildBanTableView(userBansTableView);
-        ViewHelper.buildPlayersGamesTable(userLastGamesTable);
+        ViewHelper.buildPlayersGamesTable(userLastGamesTable, replayDownLoadFormat, platformService);
 
         loadMoreGamesButton.visibleProperty()
-                .bind(Bindings.createBooleanBinding(() -> {
-                    return userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0;
-                }, userLastGamesTable.getItems()));
+                .bind(Bindings.createBooleanBinding(() -> userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0, userLastGamesTable.getItems()));
 
         featuredModFilterChoiceBox.setConverter(new StringConverter<FeaturedModFX>() {
             @Override
@@ -152,7 +154,8 @@ public FeaturedModFX fromString(String string) {
         });
         featuredModFilterChoiceBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             userLastGamesTable.getItems().clear();
-            loadMoreGamesRunnable.run();
+            page = 1;
+            if (loadMoreGamesRunnable != null) loadMoreGamesRunnable.run();
         });
 
         featuredModFilterChoiceBox.getItems().add(null);
@@ -294,8 +297,8 @@ private void onSelectedUser(ObservableValue<? extends Player> observable, Player
             userTeamkillsTableView.getItems().addAll(userService.findTeamkillsByUserId(newValue.getId()));
             userAvatarsTableView.getItems().addAll(newValue.getAvatarAssignments());
 
-            page = new AtomicInteger(1);
-            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> userService.getLastHunderedPlayedGamesByFeaturedMod(newValue.getId(), page.get(), featuredModFilterChoiceBox.getSelectionModel().getSelectedItem()))
+            page = 1;
+            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> userService.getLastHunderedPlayedGamesByFeaturedMod(newValue.getId(), page, featuredModFilterChoiceBox.getSelectionModel().getSelectedItem()))
                     .thenAccept(gamePlayerStats -> Platform.runLater(() -> userLastGamesTable.getItems().addAll(gamePlayerStats)));
             loadMoreGamesRunnable.run();
         }
@@ -438,7 +441,7 @@ public void onToggleMapVersionRanking() {
     }
 
     public void loadMoreGames() {
-        page.incrementAndGet();
+        page++;
         loadMoreGamesRunnable.run();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/PlatformService.java b/src/main/java/com/faforever/moderatorclient/ui/PlatformService.java
new file mode 100644
index 0000000..16fa219
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/PlatformService.java
@@ -0,0 +1,5 @@
+package com.faforever.moderatorclient.ui;
+
+public interface PlatformService {
+    void showDocument(String url);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/PlatformServiceImpl.java b/src/main/java/com/faforever/moderatorclient/ui/PlatformServiceImpl.java
new file mode 100644
index 0000000..246a078
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/PlatformServiceImpl.java
@@ -0,0 +1,16 @@
+package com.faforever.moderatorclient.ui;
+
+import javafx.application.HostServices;
+
+public class PlatformServiceImpl implements PlatformService {
+    private final HostServices hostService;
+
+    public PlatformServiceImpl(HostServices hostServices) {
+        this.hostService = hostServices;
+    }
+
+    @Override
+    public void showDocument(String url) {
+        hostService.showDocument(url);
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index 221788f..fa10eb3 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -5,6 +5,7 @@
 import com.faforever.moderatorclient.ui.domain.MapFX;
 import com.faforever.moderatorclient.ui.domain.MapVersionFX;
 import com.faforever.moderatorclient.ui.domain.PlayerFX;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxTableCell;
@@ -462,7 +463,7 @@ protected void updateItem(PlayerFX item, boolean empty) {
         tableView.getColumns().add(updateTimeColumn);
     }
 
-    static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView) {
+    static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView, String replayDownloadFormat, PlatformService platformService) {
         TableColumn<GamePlayerStatsFX, String> gameIdColum = new TableColumn<>("Game ID");
         gameIdColum.setCellValueFactory(param -> param.getValue().getGame().idProperty());
         gameIdColum.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -500,19 +501,45 @@ static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView) {
                 o.getValue().scoreTimeProperty()
         );
         scoreTimeDate.setCellFactory(param -> new TableCell<GamePlayerStatsFX, OffsetDateTime>() {
+            Label label;
+
+            {
+                label = new Label();
+                setGraphic(label);
+            }
             @Override
             protected void updateItem(OffsetDateTime item, boolean empty) {
                 super.updateItem(item, empty);
-                if (!empty && item != null) {
-                    setGraphic(new Label(item.format(dateTimeFormatter)));
-                } else {
-                    setGraphic(new Label("Unknown date"));
-                }
+                label.setVisible(!empty);
+                label.setText(item == null ? "unknown Date" : item.format(dateTimeFormatter));
             }
         });
         scoreTimeDate.setComparator(Comparator.naturalOrder());
         scoreTimeDate.setMinWidth(150);
         tableView.getColumns().add(scoreTimeDate);
+
+        TableColumn<GamePlayerStatsFX, String> replayUrlColumn = new TableColumn<>("Replay");
+        replayUrlColumn.setCellValueFactory(o ->
+                Bindings.createStringBinding(() -> o.getValue().getGame().getReplayUrl(replayDownloadFormat))
+        );
+        replayUrlColumn.setCellFactory(param -> new TableCell<GamePlayerStatsFX, String>() {
+            Button button;
+
+            {
+                button = new Button("Download Replay");
+                setGraphic(button);
+            }
+
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
+                button.setVisible(!empty && item != null);
+                button.setOnAction(event -> platformService.showDocument(item));
+            }
+        });
+        replayUrlColumn.setSortable(false);
+        replayUrlColumn.setMinWidth(150);
+        tableView.getColumns().add(replayUrlColumn);
     }
 
     static void buildMapVersionTableView(TableView<MapVersionFX> tableView) {
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
index 41b851c..e22879e 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
@@ -154,4 +154,8 @@ public void setMapVersion(MapVersion mapVersion) {
     public ObjectProperty<MapVersion> mapVersionProperty() {
         return mapVersion;
     }
+
+    public String getReplayUrl(String baseUrlFormat) {
+        return String.format(baseUrlFormat, id.get());
+    }
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 89fbb9a..bae4021 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,10 +5,13 @@ faforever:
     client-secret: postman
     access-token-uri: ${faforever.api.base-url}/oauth/token
     max-page-size: 10_000
+  vault:
+    base-url: http://content.faforever.com
+    replayDownloadUrlFormat: ${faforever.vault.base-url}/faf/vault/replay_vault/replay.php?id=%s
 logging:
   level:
     com.faforever.moderatorclient: DEBUG
 spring:
   jackson:
     serialization:
-      WRITE_DATES_AS_TIMESTAMPS: false
\ No newline at end of file
+      WRITE_DATES_AS_TIMESTAMPS: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8b47fa1..8391a13 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,10 +5,13 @@ faforever:
     client-secret: 370965a5-e7f2-4fe1-9225-e4517476b6a5
     access-token-uri: ${faforever.api.base-url}/oauth/token
     max-page-size: 10_000
+  vault:
+    base-url: http://content.faforever.com
+    replayDownloadUrlFormat: ${faforever.vault.base-url}/faf/vault/replay_vault/replay.php?id=%s
 logging:
   level:
     com.faforever.moderatorclient: DEBUG
 spring:
   jackson:
     serialization:
-      WRITE_DATES_AS_TIMESTAMPS: false
\ No newline at end of file
+      WRITE_DATES_AS_TIMESTAMPS: false

From c7c320bde80f97b3d830b942e95fc4dfb74b2aef Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Sat, 2 Dec 2017 23:40:01 +0100
Subject: [PATCH 07/14] rework requested changes

---
 .idea/misc.xml                                |  4 +-
 .idea/modules.xml                             |  2 +-
 pom.xml                                       |  7 --
 .../api/rest/domain/UserService.java          |  9 ++-
 .../mapstruct/FeaturedModMapper.java          |  8 +--
 .../moderatorclient/mapstruct/GameMapper.java |  2 +-
 .../mapstruct/GamePlayerStatsMapper.java      |  2 +-
 .../moderatorclient/mapstruct/MapMapper.java  | 16 +----
 .../mapstruct/MapVersionMapper.java           | 15 ++--
 .../mapstruct/PlayerMapper.java               |  8 +--
 .../moderatorclient/ui/MainController.java    | 27 ++++----
 .../moderatorclient/ui/ViewHelper.java        | 68 +++++++++----------
 .../moderatorclient/ui/domain/GameFX.java     | 38 +++++++----
 .../ui/domain/GamePlayerStatsFX.java          | 11 ++-
 .../moderatorclient/ui/domain/MapFX.java      |  1 +
 src/main/resources/ui/mainWindow.fxml         | 12 ++--
 16 files changed, 108 insertions(+), 122 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1c1e70f..97947a5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,5 +7,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b7ffb3d..7424f66 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/faf-moderator-client.iml" filepath="$PROJECT_DIR$/.idea/faf-moderator-client.iml" />
+      <module fileurl="file://$PROJECT_DIR$/faf-moderator-client.iml" filepath="$PROJECT_DIR$/faf-moderator-client.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 309ef8b..63760d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,13 +83,6 @@
             <version>1.6</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
-
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
index 31c0b3a..7511f93 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
@@ -6,7 +6,6 @@
 import com.faforever.moderatorclient.mapstruct.FeaturedModMapper;
 import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
 import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
-import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -154,7 +153,7 @@ public BanInfo createBan(@NotNull BanInfo banInfo) {
         return fafApi.post(ElideRouteBuilder.of(BanInfo.class), banInfo);
     }
 
-    public List<GamePlayerStatsFX> getLastHunderedPlayedGamesByFeaturedMod(@NotNull String userId, int page, FeaturedModFX featuredModFX) {
+    public List<GamePlayerStats> getLastHundredPlayedGamesByFeaturedMod(@NotNull String userId, int page, FeaturedModFX featuredModFX) {
         log.debug("Searching for games played by user id: {}", userId);
         ElideRouteBuilder<GamePlayerStats> routeBuilder = ElideRouteBuilder.of(GamePlayerStats.class)
                 .addInclude("game")
@@ -170,11 +169,11 @@ public List<GamePlayerStatsFX> getLastHunderedPlayedGamesByFeaturedMod(@NotNull
         } else {
             routeBuilder.filter(ElideRouteBuilder.qBuilder().string("player.id").eq(userId));
         }
-        return gamePlayerStatsMapper.map(fafApi.getPage(routeBuilder, 100, page, Collections.emptyMap()));
+        return fafApi.getPage(routeBuilder, 100, page, Collections.emptyMap());
     }
 
-    public List<GamePlayerStatsFX> getLastHunderedPlayedGames(@NotNull String userId, int page) {
-        return getLastHunderedPlayedGamesByFeaturedMod(userId, page, null);
+    public List<GamePlayerStats> getLastHundredPlayedGames(@NotNull String userId, int page) {
+        return getLastHundredPlayedGamesByFeaturedMod(userId, page, null);
     }
 
     public List<FeaturedModFX> getFeaturedMods() {
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java
index e3c31f1..9a04cd6 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/FeaturedModMapper.java
@@ -7,10 +7,10 @@
 import java.util.List;
 
 @Mapper(uses = JavaFXMapper.class)
-public abstract class FeaturedModMapper {
-    public abstract FeaturedModFX map(FeaturedMod featuredMod);
+public interface FeaturedModMapper {
+    FeaturedModFX map(FeaturedMod featuredMod);
 
-    public abstract FeaturedMod map(FeaturedModFX featuredModFX);
+    FeaturedMod map(FeaturedModFX featuredModFX);
 
-    public abstract List<FeaturedModFX> map(List<FeaturedMod> featuredMods);
+    List<FeaturedModFX> map(List<FeaturedMod> featuredMods);
 }
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java
index 5bbd9c5..2a280dd 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/GameMapper.java
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-@Mapper(uses = {JavaFXMapper.class, PlayerMapper.class, FeaturedModMapper.class, MapVersionMapper.class})
+@Mapper(uses = {JavaFXMapper.class, GamePlayerStatsMapper.class, PlayerMapper.class, FeaturedModMapper.class, MapVersionMapper.class})
 public abstract class GameMapper {
     @Mapping(target = "reviews", ignore = true)
     public abstract GameFX map(Game game);
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
index d7b5ab1..4f14201 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/GamePlayerStatsMapper.java
@@ -7,7 +7,7 @@
 
 import java.util.List;
 
-@Mapper(uses = {JavaFXMapper.class, GameMapper.class, PlayerMapper.class})
+@Mapper(uses = {JavaFXMapper.class, GameMapper.class, PlayerMapper.class, CycleAvoidingMappingContext.class})
 public abstract class GamePlayerStatsMapper {
 
     @Mapping(target = "beforeRating", ignore = true)
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java
index 030367a..c6f7965 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/MapMapper.java
@@ -2,29 +2,15 @@
 
 import com.faforever.moderatorclient.api.dto.Map;
 import com.faforever.moderatorclient.ui.domain.MapFX;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
 
 import java.util.List;
 
-@Mapper(uses = {JavaFXMapper.class, MapVersionMapper.class})
+@Mapper(uses = {JavaFXMapper.class, MapVersionMapper.class, PlayerMapper.class, CycleAvoidingMappingContext.class})
 public abstract class MapMapper {
     public abstract MapFX map(Map map);
 
-    @AfterMapping
-    protected void addBackReferences(@MappingTarget MapFX mapFX) {
-        mapFX.getVersions().forEach(mapVersionFX -> mapVersionFX.setMap(mapFX));
-        mapFX.getLatestVersion().setMap(mapFX);
-    }
-
     public abstract Map map(MapFX mapFX);
 
-    @AfterMapping
-    protected void addBackReferences(@MappingTarget Map map) {
-        map.getVersions().forEach(mapVersionFX -> mapVersionFX.setMap(map));
-        map.getLatestVersion().setMap(map);
-    }
-
     public abstract List<MapFX> map(List<Map> mapList);
 }
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
index b951d1d..81937e9 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/MapVersionMapper.java
@@ -3,19 +3,16 @@
 import com.faforever.moderatorclient.api.dto.MapVersion;
 import com.faforever.moderatorclient.ui.domain.MapVersionFX;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 
 import java.util.List;
 
-@Mapper(uses = {JavaFXMapper.class})
-public interface MapVersionMapper {
-    @Mapping(target = "map", ignore = true)
-    MapVersionFX map(MapVersion mapVersion);
+@Mapper(uses = {JavaFXMapper.class, MapMapper.class, CycleAvoidingMappingContext.class})
+public abstract class MapVersionMapper {
+    public abstract MapVersionFX map(MapVersion mapVersion);
 
-    @Mapping(target = "map", ignore = true)
-    MapVersion map(MapVersionFX mapVersionFX);
+    public abstract MapVersion map(MapVersionFX mapVersionFX);
 
-    List<MapVersionFX> mapToFX(List<MapVersion> mapVersionList);
+    public abstract List<MapVersionFX> mapToFX(List<MapVersion> mapVersionList);
 
-    List<MapVersion> mapToDTO(List<MapVersionFX> mapVersionFXList);
+    public abstract List<MapVersion> mapToDTO(List<MapVersionFX> mapVersionFXList);
 }
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java
index fad3fb4..90939cf 100644
--- a/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java
@@ -7,10 +7,10 @@
 import java.util.List;
 
 @Mapper(uses = {JavaFXMapper.class, CycleAvoidingMappingContext.class})
-public interface PlayerMapper {
-    PlayerFX map(Player player);
+public abstract class PlayerMapper {
+    public abstract PlayerFX map(Player player);
 
-    Player map(PlayerFX playerFX);
+    public abstract Player map(PlayerFX playerFX);
 
-    List<PlayerFX> map(List<Player> playerList);
+    public abstract List<PlayerFX> map(List<Player> playerList);
 }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index 40266e9..aa9e816 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -4,6 +4,7 @@
 import com.faforever.moderatorclient.api.rest.domain.AvatarService;
 import com.faforever.moderatorclient.api.rest.domain.MapService;
 import com.faforever.moderatorclient.api.rest.domain.UserService;
+import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
 import com.faforever.moderatorclient.mapstruct.MapMapper;
 import com.faforever.moderatorclient.mapstruct.MapVersionMapper;
 import com.faforever.moderatorclient.mapstruct.PlayerMapper;
@@ -39,6 +40,7 @@ public class MainController implements Controller<TabPane> {
     private final MapMapper mapMapper;
     private final MapVersionMapper mapVersionMapper;
     private final PlayerMapper playerMapper;
+    private final GamePlayerStatsMapper gamePlayerStatsMapper;
 
     private final UiService uiService;
     private final UserService userService;
@@ -63,6 +65,11 @@ public class MainController implements Controller<TabPane> {
     public TableView<BanInfo> userBansTableView;
     public TableView<Teamkill> userTeamkillsTableView;
     public TableView<AvatarAssignment> userAvatarsTableView;
+    public TableView<GamePlayerStatsFX> userLastGamesTable;
+    public ChoiceBox<FeaturedModFX> featuredModFilterChoiceBox;
+    public Button loadMoreGamesButton;
+    private Runnable loadMoreGamesRunnable;
+    private int userGamesPage = 1;
 
     // Tab "Ladder Map Pool"
     public TreeTableView<MapTableItemAdapter> ladderPoolView;
@@ -98,18 +105,14 @@ public class MainController implements Controller<TabPane> {
     // Tab "Recent activity"
     public TableView<Player> userRegistrationFeedTableView;
     public TableView<Teamkill> teamkillFeedTableView;
-    public TableView<GamePlayerStatsFX> userLastGamesTable;
-    public ChoiceBox<FeaturedModFX> featuredModFilterChoiceBox;
-    public Button loadMoreGamesButton;
-    private Runnable loadMoreGamesRunnable;
-    private int page = 1;
     private final String replayDownLoadFormat;
     private final PlatformService platformService;
 
-    public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService, @Value("${faforever.vault.replayDownloadUrlFormat}") String replayDownLoadFormat, PlatformService platformService) {
+    public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, GamePlayerStatsMapper gamePlayerStatsMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService, @Value("${faforever.vault.replayDownloadUrlFormat}") String replayDownLoadFormat, PlatformService platformService) {
         this.mapMapper = mapMapper;
         this.mapVersionMapper = mapVersionMapper;
         this.playerMapper = playerMapper;
+        this.gamePlayerStatsMapper = gamePlayerStatsMapper;
         this.uiService = uiService;
         this.userService = userService;
         this.mapService = mapSearchService;
@@ -154,7 +157,7 @@ public FeaturedModFX fromString(String string) {
         });
         featuredModFilterChoiceBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             userLastGamesTable.getItems().clear();
-            page = 1;
+            userGamesPage = 1;
             if (loadMoreGamesRunnable != null) loadMoreGamesRunnable.run();
         });
 
@@ -167,9 +170,7 @@ public FeaturedModFX fromString(String string) {
         ViewHelper.buildUserAvatarsTableView(userAvatarsTableView);
 
         userSearchTableView.getSelectionModel().selectedItemProperty().addListener(this::onSelectedUser);
-        userBansTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            editBanButton.setDisable(newValue == null);
-        });
+        userBansTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> editBanButton.setDisable(newValue == null));
     }
 
     private void initLadderMapPoolTab() {
@@ -297,8 +298,8 @@ private void onSelectedUser(ObservableValue<? extends Player> observable, Player
             userTeamkillsTableView.getItems().addAll(userService.findTeamkillsByUserId(newValue.getId()));
             userAvatarsTableView.getItems().addAll(newValue.getAvatarAssignments());
 
-            page = 1;
-            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> userService.getLastHunderedPlayedGamesByFeaturedMod(newValue.getId(), page, featuredModFilterChoiceBox.getSelectionModel().getSelectedItem()))
+            userGamesPage = 1;
+            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> gamePlayerStatsMapper.map(userService.getLastHundredPlayedGamesByFeaturedMod(newValue.getId(), userGamesPage, featuredModFilterChoiceBox.getSelectionModel().getSelectedItem())))
                     .thenAccept(gamePlayerStats -> Platform.runLater(() -> userLastGamesTable.getItems().addAll(gamePlayerStats)));
             loadMoreGamesRunnable.run();
         }
@@ -441,7 +442,7 @@ public void onToggleMapVersionRanking() {
     }
 
     public void loadMoreGames() {
-        page++;
+        userGamesPage++;
         loadMoreGamesRunnable.run();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index fa10eb3..719b82c 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -84,7 +84,6 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
         idColumn.setMinWidth(50);
-        idColumn.setEditable(false);
         tableView.getColumns().add(idColumn);
 
         TableColumn<AvatarAssignment, String> userIdColumn = new TableColumn<>("User ID");
@@ -95,7 +94,6 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
         );
         userIdColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
         userIdColumn.setMinWidth(50);
-        idColumn.setEditable(false);
         tableView.getColumns().add(userIdColumn);
 
         TableColumn<AvatarAssignment, String> userNameColumn = new TableColumn<>("User name");
@@ -105,7 +103,6 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
                         .orElse(""))
         );
         userNameColumn.setMinWidth(150);
-        userNameColumn.setEditable(false);
         tableView.getColumns().add(userNameColumn);
 
         TableColumn<AvatarAssignment, Boolean> selectedColumn = new TableColumn<>("Selected");
@@ -122,7 +119,6 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
         TableColumn<AvatarAssignment, OffsetDateTime> assignedAtColumn = new TableColumn<>("Assigned at");
         assignedAtColumn.setCellValueFactory(new PropertyValueFactory<>("createTime"));
         assignedAtColumn.setMinWidth(180);
-        idColumn.setEditable(false);
         tableView.getColumns().add(assignedAtColumn);
     }
 
@@ -464,43 +460,43 @@ protected void updateItem(PlayerFX item, boolean empty) {
     }
 
     static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView, String replayDownloadFormat, PlatformService platformService) {
-        TableColumn<GamePlayerStatsFX, String> gameIdColum = new TableColumn<>("Game ID");
-        gameIdColum.setCellValueFactory(param -> param.getValue().getGame().idProperty());
-        gameIdColum.setComparator(Comparator.comparingInt(Integer::parseInt));
-        gameIdColum.setMinWidth(100);
-        tableView.getColumns().add(gameIdColum);
-
-        TableColumn<GamePlayerStatsFX, String> gameNameColum = new TableColumn<>("Game Name");
-        gameNameColum.setCellValueFactory(o -> o.getValue().getGame().nameProperty());
-        gameNameColum.setMinWidth(100);
-        tableView.getColumns().add(gameNameColum);
-
-        TableColumn<GamePlayerStatsFX, String> rankedColum = new TableColumn<>("Game Validity");
-        rankedColum.setCellValueFactory(param -> new SimpleObjectProperty<>(
-                param.getValue().getGame().getValidity().name()
+        TableColumn<GamePlayerStatsFX, String> gameIdColumn = new TableColumn<>("Game ID");
+        gameIdColumn.setCellValueFactory(o -> o.getValue().getGame().idProperty());
+        gameIdColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
+        gameIdColumn.setMinWidth(100);
+        tableView.getColumns().add(gameIdColumn);
+
+        TableColumn<GamePlayerStatsFX, String> gameNameColumn = new TableColumn<>("Game Name");
+        gameNameColumn.setCellValueFactory(o -> o.getValue().getGame().nameProperty());
+        gameNameColumn.setMinWidth(100);
+        tableView.getColumns().add(gameNameColumn);
+
+        TableColumn<GamePlayerStatsFX, String> rankedColumn = new TableColumn<>("Game Validity");
+        rankedColumn.setCellValueFactory(o -> new SimpleObjectProperty<>(
+                o.getValue().getGame().getValidity().name()
         ));
-        rankedColum.setComparator(Comparator.naturalOrder());
-        rankedColum.setMinWidth(120);
-        tableView.getColumns().add(rankedColum);
+        rankedColumn.setComparator(Comparator.naturalOrder());
+        rankedColumn.setMinWidth(120);
+        tableView.getColumns().add(rankedColumn);
 
-        TableColumn<GamePlayerStatsFX, Number> beforeGameRatingColum = new TableColumn<>("Rating Before Game");
-        beforeGameRatingColum.setCellValueFactory(o -> o.getValue().beforeRatingProperty());
-        beforeGameRatingColum.setMinWidth(150);
-        tableView.getColumns().add(beforeGameRatingColum);
+        TableColumn<GamePlayerStatsFX, Number> beforeGameRatingColumn = new TableColumn<>("Rating Before Game");
+        beforeGameRatingColumn.setCellValueFactory(o -> o.getValue().beforeRatingProperty());
+        beforeGameRatingColumn.setMinWidth(150);
+        tableView.getColumns().add(beforeGameRatingColumn);
 
-        TableColumn<GamePlayerStatsFX, Number> afterGameRatingColum = new TableColumn<>("Rating Change");
-        afterGameRatingColum.setCellValueFactory(o -> o.getValue().ratingChangeProperty());
-        afterGameRatingColum.setMinWidth(100);
-        tableView.getColumns().add(afterGameRatingColum);
+        TableColumn<GamePlayerStatsFX, Number> afterGameRatingColumn = new TableColumn<>("Rating Change");
+        afterGameRatingColumn.setCellValueFactory(o -> o.getValue().ratingChangeProperty());
+        afterGameRatingColumn.setMinWidth(100);
+        tableView.getColumns().add(afterGameRatingColumn);
 
-        TableColumn<GamePlayerStatsFX, OffsetDateTime> scoreTimeDate = new TableColumn<>("Score Time");
+        TableColumn<GamePlayerStatsFX, OffsetDateTime> scoreTimeDateColumn = new TableColumn<>("Score Time");
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
                 .withLocale(Locale.getDefault())
                 .withZone(TimeZone.getDefault().toZoneId());
-        scoreTimeDate.setCellValueFactory(o ->
+        scoreTimeDateColumn.setCellValueFactory(o ->
                 o.getValue().scoreTimeProperty()
         );
-        scoreTimeDate.setCellFactory(param -> new TableCell<GamePlayerStatsFX, OffsetDateTime>() {
+        scoreTimeDateColumn.setCellFactory(param -> new TableCell<GamePlayerStatsFX, OffsetDateTime>() {
             Label label;
 
             {
@@ -511,12 +507,12 @@ static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView, Strin
             protected void updateItem(OffsetDateTime item, boolean empty) {
                 super.updateItem(item, empty);
                 label.setVisible(!empty);
-                label.setText(item == null ? "unknown Date" : item.format(dateTimeFormatter));
+                label.setText(item == null ? "unknown date" : item.format(dateTimeFormatter));
             }
         });
-        scoreTimeDate.setComparator(Comparator.naturalOrder());
-        scoreTimeDate.setMinWidth(150);
-        tableView.getColumns().add(scoreTimeDate);
+        scoreTimeDateColumn.setComparator(Comparator.naturalOrder());
+        scoreTimeDateColumn.setMinWidth(150);
+        tableView.getColumns().add(scoreTimeDateColumn);
 
         TableColumn<GamePlayerStatsFX, String> replayUrlColumn = new TableColumn<>("Replay");
         replayUrlColumn.setCellValueFactory(o ->
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
index e22879e..6b0b1b5 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/GameFX.java
@@ -1,6 +1,8 @@
 package com.faforever.moderatorclient.ui.domain;
 
-import com.faforever.moderatorclient.api.dto.*;
+import com.faforever.moderatorclient.api.dto.GameReview;
+import com.faforever.moderatorclient.api.dto.Validity;
+import com.faforever.moderatorclient.api.dto.VictoryCondition;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,6 +11,7 @@
 import javafx.collections.ObservableList;
 
 import java.time.OffsetDateTime;
+import java.util.List;
 
 public class GameFX extends AbstractEntityFX {
     private final StringProperty id;
@@ -18,10 +21,10 @@ public class GameFX extends AbstractEntityFX {
     private final ObjectProperty<Validity> validity;
     private final ObjectProperty<VictoryCondition> victoryCondition;
     private final ObservableList<GameReview> reviews;
-    private final ObservableList<GamePlayerStats> playerStats;
-    private final ObjectProperty<Player> host;
-    private final ObjectProperty<FeaturedMod> featuredMod;
-    private final ObjectProperty<MapVersion> mapVersion;
+    private final ObservableList<GamePlayerStatsFX> playerStats;
+    private final ObjectProperty<PlayerFX> host;
+    private final ObjectProperty<FeaturedModFX> featuredMod;
+    private final ObjectProperty<MapVersionFX> mapVersion;
 
     public GameFX() {
         this.id = new SimpleStringProperty();
@@ -115,43 +118,48 @@ public ObservableList<GameReview> getReviews() {
         return reviews;
     }
 
-    public ObservableList<GamePlayerStats> getPlayerStats() {
+    public ObservableList<GamePlayerStatsFX> getPlayerStats() {
         return playerStats;
     }
 
-    public Player getHost() {
+    public void setPlayerStats(List<GamePlayerStatsFX> statsFXList) {
+        playerStats.clear();
+        playerStats.addAll(statsFXList);
+    }
+
+    public PlayerFX getHost() {
         return host.get();
     }
 
-    public void setHost(Player host) {
+    public void setHost(PlayerFX host) {
         this.host.set(host);
     }
 
-    public ObjectProperty<Player> hostProperty() {
+    public ObjectProperty<PlayerFX> hostProperty() {
         return host;
     }
 
-    public FeaturedMod getFeaturedMod() {
+    public FeaturedModFX getFeaturedMod() {
         return featuredMod.get();
     }
 
-    public void setFeaturedMod(FeaturedMod featuredMod) {
+    public void setFeaturedMod(FeaturedModFX featuredMod) {
         this.featuredMod.set(featuredMod);
     }
 
-    public ObjectProperty<FeaturedMod> featuredModProperty() {
+    public ObjectProperty<FeaturedModFX> featuredModProperty() {
         return featuredMod;
     }
 
-    public MapVersion getMapVersion() {
+    public MapVersionFX getMapVersion() {
         return mapVersion.get();
     }
 
-    public void setMapVersion(MapVersion mapVersion) {
+    public void setMapVersion(MapVersionFX mapVersion) {
         this.mapVersion.set(mapVersion);
     }
 
-    public ObjectProperty<MapVersion> mapVersionProperty() {
+    public ObjectProperty<MapVersionFX> mapVersionProperty() {
         return mapVersion;
     }
 
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java
index adff811..76b803b 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/GamePlayerStatsFX.java
@@ -1,7 +1,6 @@
 package com.faforever.moderatorclient.ui.domain;
 
 import com.faforever.moderatorclient.api.dto.Faction;
-import com.faforever.moderatorclient.api.dto.Player;
 import javafx.beans.property.*;
 
 import java.time.OffsetDateTime;
@@ -20,7 +19,7 @@ public class GamePlayerStatsFX extends AbstractEntityFX {
     private final ObjectProperty<Byte> score;
     private final ObjectProperty<OffsetDateTime> scoreTime;
     private final ObjectProperty<GameFX> game;
-    private final ObjectProperty<Player> player;
+    private final ObjectProperty<PlayerFX> player;
     private final IntegerProperty ratingChange;
     private final IntegerProperty beforeRating;
     private final IntegerProperty afterRating;
@@ -243,15 +242,15 @@ public ObjectProperty<GameFX> gameProperty() {
         return game;
     }
 
-    public Player getPlayer() {
+    public PlayerFX getPlayer() {
         return player.get();
     }
 
-    public void setPlayer(Player player) {
-        this.player.set(player);
+    public void setPlayer(PlayerFX playerFX) {
+        this.player.set(playerFX);
     }
 
-    public ObjectProperty<Player> playerProperty() {
+    public ObjectProperty<PlayerFX> playerProperty() {
         return player;
     }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java
index fd8c80d..2f09104 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/MapFX.java
@@ -140,6 +140,7 @@ public ObservableList<MapVersionFX> getVersions() {
     }
 
     public void setVersions(List<MapVersionFX> versionFXList) {
+        versions.clear();
         versions.addAll(versionFXList);
     }
 
diff --git a/src/main/resources/ui/mainWindow.fxml b/src/main/resources/ui/mainWindow.fxml
index d4be1f0..d53b02b 100644
--- a/src/main/resources/ui/mainWindow.fxml
+++ b/src/main/resources/ui/mainWindow.fxml
@@ -133,10 +133,14 @@
                                     <content>
                                         <VBox>
                                             <HBox spacing="10">
-                                                <Label text="Show featured Mods:"/>
-                                                <ChoiceBox fx:id="featuredModFilterChoiceBox"/>
-                                                <Button fx:id="loadMoreGamesButton" text="Load more"
-                                                        onAction="#loadMoreGames"/>
+                                                <Label maxHeight="1.7976931348623157E308"
+                                                       maxWidth="1.7976931348623157E308" text="Show featured Mods:"/>
+                                                <ChoiceBox fx:id="featuredModFilterChoiceBox" minWidth="150.0"/>
+                                                <Button fx:id="loadMoreGamesButton" onAction="#loadMoreGames"
+                                                        text="Load more"/>
+                                                <VBox.margin>
+                                                    <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                                </VBox.margin>
                                             </HBox>
                                             <TableView fx:id="userLastGamesTable" maxHeight="1.7976931348623157E308"
                                                        maxWidth="1.7976931348623157E308" VBox.vgrow="ALWAYS"/>

From 6bcc58cafe8245eced0ae69e682fb2fea3df3686 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Sun, 3 Dec 2017 01:43:25 +0100
Subject: [PATCH 08/14] fixes #29 preselect search by username

---
 src/main/resources/ui/mainWindow.fxml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/ui/mainWindow.fxml b/src/main/resources/ui/mainWindow.fxml
index d53b02b..edba8e3 100644
--- a/src/main/resources/ui/mainWindow.fxml
+++ b/src/main/resources/ui/mainWindow.fxml
@@ -18,8 +18,8 @@
                             <children>
                                 <VBox minWidth="220.0">
                                     <children>
-                                        <RadioButton fx:id="searchUserByIdRadioButton" mnemonicParsing="false"
-                                                     selected="true" text="search by id">
+                                        <RadioButton fx:id="searchUserByCurrentNameRadioButton" mnemonicParsing="false"
+                                                     selected="true" text="search by current name">
                                             <VBox.margin>
                                                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                                             </VBox.margin>
@@ -27,15 +27,15 @@
                                                 <ToggleGroup fx:id="userSearch"/>
                                             </toggleGroup>
                                         </RadioButton>
-                                        <RadioButton fx:id="searchUserByCurrentNameRadioButton" mnemonicParsing="false"
-                                                     text="search by current name" toggleGroup="$userSearch">
+                                        <RadioButton fx:id="searchUserByPreviousNamesRadioButton"
+                                                     mnemonicParsing="false" text="search by previous names"
+                                                     toggleGroup="$userSearch">
                                             <VBox.margin>
                                                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                                             </VBox.margin>
                                         </RadioButton>
-                                        <RadioButton fx:id="searchUserByPreviousNamesRadioButton"
-                                                     mnemonicParsing="false" text="search by previous names"
-                                                     toggleGroup="$userSearch">
+                                        <RadioButton fx:id="searchUserByIdRadioButton" mnemonicParsing="false"
+                                                     text="search by id" toggleGroup="$userSearch">
                                             <VBox.margin>
                                                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                                             </VBox.margin>

From 7334adbe978527c8b99e5b4c60010c8468b16bdd Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Sun, 3 Dec 2017 03:02:09 +0100
Subject: [PATCH 09/14] fixes #25 Split MainController into one controller per
 main tab

---
 .../moderatorclient/ui/MainController.java    | 410 +-------------
 .../moderatorclient/ui/ViewHelper.java        |  28 +-
 .../ui/main_window/AvatarsController.java     |  78 +++
 .../main_window/LadderMapPoolController.java  | 109 ++++
 .../ui/main_window/MapVaultController.java    | 112 ++++
 .../main_window/RecentActivityController.java |  47 ++
 .../main_window/UserManagementController.java | 195 +++++++
 src/main/resources/ui/mainWindow.fxml         | 529 +-----------------
 .../resources/ui/main_window/avatars.fxml     |  88 +++
 .../ui/main_window/ladderMapPool.fxml         | 111 ++++
 .../resources/ui/main_window/mapVault.fxml    | 130 +++++
 .../ui/main_window/recentActivity.fxml        |  33 ++
 .../ui/main_window/userManagement.fxml        | 150 +++++
 13 files changed, 1104 insertions(+), 916 deletions(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/main_window/AvatarsController.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/main_window/LadderMapPoolController.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/main_window/MapVaultController.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/main_window/RecentActivityController.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
 create mode 100644 src/main/resources/ui/main_window/avatars.fxml
 create mode 100644 src/main/resources/ui/main_window/ladderMapPool.fxml
 create mode 100644 src/main/resources/ui/main_window/mapVault.fxml
 create mode 100644 src/main/resources/ui/main_window/recentActivity.fxml
 create mode 100644 src/main/resources/ui/main_window/userManagement.fxml

diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index aa9e816..e473483 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -1,124 +1,37 @@
 package com.faforever.moderatorclient.ui;
 
-import com.faforever.moderatorclient.api.dto.*;
-import com.faforever.moderatorclient.api.rest.domain.AvatarService;
-import com.faforever.moderatorclient.api.rest.domain.MapService;
-import com.faforever.moderatorclient.api.rest.domain.UserService;
-import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
-import com.faforever.moderatorclient.mapstruct.MapMapper;
-import com.faforever.moderatorclient.mapstruct.MapVersionMapper;
-import com.faforever.moderatorclient.mapstruct.PlayerMapper;
-import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
-import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
-import com.faforever.moderatorclient.ui.domain.MapFX;
-import com.faforever.moderatorclient.ui.domain.MapVersionFX;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.value.ObservableValue;
+import com.faforever.moderatorclient.ui.main_window.*;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import javafx.util.StringConverter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 
 @Component
 @Slf4j
 public class MainController implements Controller<TabPane> {
-    private final MapMapper mapMapper;
-    private final MapVersionMapper mapVersionMapper;
-    private final PlayerMapper playerMapper;
-    private final GamePlayerStatsMapper gamePlayerStatsMapper;
+    public Tab userManagementTab;
+    public Tab ladderMapPoolTab;
+    public Tab mapVaultTab;
+    public Tab modVaultTab;
+    public Tab avatarsTab;
+
 
     private final UiService uiService;
-    private final UserService userService;
-    private final MapService mapService;
-    private final AvatarService avatarService;
 
     public TabPane root;
-
-
-    // Tab "User Management"
-    public RadioButton searchUserByIdRadioButton;
-    public RadioButton searchUserByCurrentNameRadioButton;
-    public RadioButton searchUserByPreviousNamesRadioButton;
-    public RadioButton searchUserByEmailRadioButton;
-    public RadioButton searchUserBySteamIdRadioButton;
-    public RadioButton searchUserByIpRadioButton;
-    public TextField userSearchTextField;
-    public Button newBanButton;
-    public Button editBanButton;
-    public TableView<Player> userSearchTableView;
-    public TableView<NameRecord> userNameHistoryTableView;
-    public TableView<BanInfo> userBansTableView;
-    public TableView<Teamkill> userTeamkillsTableView;
-    public TableView<AvatarAssignment> userAvatarsTableView;
-    public TableView<GamePlayerStatsFX> userLastGamesTable;
-    public ChoiceBox<FeaturedModFX> featuredModFilterChoiceBox;
-    public Button loadMoreGamesButton;
-    private Runnable loadMoreGamesRunnable;
-    private int userGamesPage = 1;
-
-    // Tab "Ladder Map Pool"
-    public TreeTableView<MapTableItemAdapter> ladderPoolView;
-    public TreeTableView<MapTableItemAdapter> mapVaultView;
-    public CheckBox filterByMapNameCheckBox;
-    public TextField mapNamePatternTextField;
-    public ImageView ladderPoolImageView;
-    public ImageView mapVaultImageView;
-    public Button removeFromPoolButton;
-    public Button addToPoolButton;
-
-    // Tab "Map vault"
-    public RadioButton searchMapByMapNameRadioButton;
-    public RadioButton searchMapByAuthorIdRadioButton;
-    public RadioButton searchMapByAuthorNameRadioButton;
-    public TextField mapSearchTextField;
-    public CheckBox excludeHiddenMapVersionsCheckbox;
-    public ImageView mapVersionPreviewImageView;
-    public TableView<MapFX> mapSearchTableView;
-    public TableView<MapVersionFX> mapVersionTableView;
-    public Button toggleMapVersionHidingButton;
-    public Button toggleMapVersionRatingButton;
-
-    // Tab "Avatars"
-    public TableView<Avatar> avatarTableView;
-    public TableView<AvatarAssignment> avatarAssignmentTableView;
-    public RadioButton showAllAvatarsRadioButton;
-    public RadioButton searchAvatarsByIdRadioButton;
-    public RadioButton searchAvatarsByTooltipRadioButton;
-    public RadioButton searchAvatarsByAssignedUserRadioButton;
-    public TextField searchAvatarsTextField;
-
-    // Tab "Recent activity"
-    public TableView<Player> userRegistrationFeedTableView;
-    public TableView<Teamkill> teamkillFeedTableView;
-    private final String replayDownLoadFormat;
-    private final PlatformService platformService;
-
-    public MainController(MapMapper mapMapper, MapVersionMapper mapVersionMapper, PlayerMapper playerMapper, GamePlayerStatsMapper gamePlayerStatsMapper, UiService uiService, UserService userService, MapService mapSearchService, AvatarService avatarService, @Value("${faforever.vault.replayDownloadUrlFormat}") String replayDownLoadFormat, PlatformService platformService) {
-        this.mapMapper = mapMapper;
-        this.mapVersionMapper = mapVersionMapper;
-        this.playerMapper = playerMapper;
-        this.gamePlayerStatsMapper = gamePlayerStatsMapper;
+    public Tab recentActivityTab;
+    private UserManagementController userManagementController;
+    private LadderMapPoolController ladderMapPoolController;
+    private MapVaultController mapVaultController;
+    private AvatarsController avatarsController;
+    private RecentActivityController recentActivityController;
+
+    public MainController(UiService uiService) {
         this.uiService = uiService;
-        this.userService = userService;
-        this.mapService = mapSearchService;
-        this.avatarService = avatarService;
-        this.replayDownLoadFormat = replayDownLoadFormat;
-        this.platformService = platformService;
     }
 
     @Override
@@ -136,102 +49,28 @@ public void initialize() {
     }
 
     private void initUserManagementTab() {
-        ViewHelper.buildUserTableView(userSearchTableView);
-        ViewHelper.buildNameHistoryTableView(userNameHistoryTableView);
-        ViewHelper.buildBanTableView(userBansTableView);
-        ViewHelper.buildPlayersGamesTable(userLastGamesTable, replayDownLoadFormat, platformService);
-
-        loadMoreGamesButton.visibleProperty()
-                .bind(Bindings.createBooleanBinding(() -> userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0, userLastGamesTable.getItems()));
-
-        featuredModFilterChoiceBox.setConverter(new StringConverter<FeaturedModFX>() {
-            @Override
-            public String toString(FeaturedModFX object) {
-                return object == null ? "All" : object.getDisplayName();
-            }
-
-            @Override
-            public FeaturedModFX fromString(String string) {
-                throw (new UnsupportedOperationException("Not implemented"));
-            }
-        });
-        featuredModFilterChoiceBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            userLastGamesTable.getItems().clear();
-            userGamesPage = 1;
-            if (loadMoreGamesRunnable != null) loadMoreGamesRunnable.run();
-        });
-
-        featuredModFilterChoiceBox.getItems().add(null);
-        featuredModFilterChoiceBox.getSelectionModel().select(0);
-        CompletableFuture.supplyAsync(userService::getFeaturedMods)
-                .thenAccept(featuredMods -> Platform.runLater(() -> featuredModFilterChoiceBox.getItems().addAll(featuredMods)));
-
-        ViewHelper.buildTeamkillTableView(userTeamkillsTableView, false);
-        ViewHelper.buildUserAvatarsTableView(userAvatarsTableView);
-
-        userSearchTableView.getSelectionModel().selectedItemProperty().addListener(this::onSelectedUser);
-        userBansTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> editBanButton.setDisable(newValue == null));
+        userManagementController = uiService.loadFxml("ui/main_window/userManagement.fxml");
+        userManagementTab.setContent(userManagementController.getRoot());
     }
 
     private void initLadderMapPoolTab() {
-        ViewHelper.buildMapTreeView(ladderPoolView);
-        ViewHelper.bindMapTreeViewToImageView(ladderPoolView, ladderPoolImageView);
-
-        ladderPoolView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue == null || newValue.getValue() == null) {
-                removeFromPoolButton.setDisable(true);
-            } else {
-                removeFromPoolButton.setDisable(!newValue.getValue().isMapVersion());
-            }
-        });
-
-        ViewHelper.buildMapTreeView(mapVaultView);
-        ViewHelper.bindMapTreeViewToImageView(mapVaultView, mapVaultImageView);
-        mapVaultView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue == null || newValue.getValue() == null) {
-                addToPoolButton.setDisable(true);
-            } else {
-                addToPoolButton.setDisable(!newValue.getValue().isMapVersion());
-            }
-        });
+        ladderMapPoolController = uiService.loadFxml("ui/main_window/ladderMapPool.fxml");
+        ladderMapPoolTab.setContent(ladderMapPoolController.getRoot());
     }
 
     private void initMapVaultTab() {
-        ViewHelper.buildMapTableView(mapSearchTableView);
-        ViewHelper.buildMapVersionTableView(mapVersionTableView);
-
-        mapSearchTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            mapVersionTableView.getItems().clear();
-            Optional.ofNullable(newValue).ifPresent(map -> mapVersionTableView.getItems().addAll(
-                    map.getVersions()));
-        });
-
-        mapVersionTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue == null) {
-                mapVersionPreviewImageView.setImage(null);
-                toggleMapVersionHidingButton.setDisable(true);
-                toggleMapVersionRatingButton.setDisable(true);
-            } else {
-                mapVersionPreviewImageView.setImage(new Image(newValue.getThumbnailUrlLarge().toString()));
-                toggleMapVersionHidingButton.setDisable(false);
-                toggleMapVersionRatingButton.setDisable(false);
-            }
-        });
+        mapVaultController = uiService.loadFxml("ui/main_window/mapVault.fxml");
+        mapVaultTab.setContent(mapVaultController.getRoot());
     }
 
     private void initAvatarTab() {
-        ViewHelper.buildAvatarTableView(avatarTableView);
-        ViewHelper.buildAvatarAssignmentTableView(avatarAssignmentTableView);
-
-        avatarTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            avatarAssignmentTableView.getItems().clear();
-            Optional.ofNullable(newValue).ifPresent(avatar -> avatarAssignmentTableView.getItems().addAll(avatar.getAssignments()));
-        });
+        avatarsController = uiService.loadFxml("ui/main_window/avatars.fxml");
+        avatarsTab.setContent(avatarsController.getRoot());
     }
 
     private void initRecentActivityTab() {
-        ViewHelper.buildUserTableView(userRegistrationFeedTableView);
-        ViewHelper.buildTeamkillTableView(teamkillFeedTableView, true);
+        recentActivityController = uiService.loadFxml("ui/main_window/recentActivity.fxml");
+        recentActivityTab.setContent(recentActivityController.getRoot());
     }
 
     public void display() {
@@ -245,204 +84,17 @@ public void display() {
         loginDialog.initStyle(StageStyle.UTILITY);
         loginDialog.showAndWait();
 
-        refreshLadderPool();
+        ladderMapPoolController.refresh();
         refreshAvatars();
         refreshRecentActivity();
     }
 
-    private void refreshLadderPool() {
-        ladderPoolView.getRoot().getChildren().clear();
-        ladderPoolView.getSortOrder().clear();
-        mapService.findMapsInLadder1v1Pool()
-                .forEach(map -> {
-                    TreeItem<MapTableItemAdapter> mapItem = new TreeItem<>(new MapTableItemAdapter(map));
-                    ladderPoolView.getRoot().getChildren().add(mapItem);
-
-                    map.getVersions().forEach(mapVersion -> mapItem.getChildren().add(new TreeItem<>(new MapTableItemAdapter(mapVersion))));
-                });
-    }
 
-    private void refreshAvatars() {
-        avatarTableView.getItems().clear();
-        avatarTableView.getSortOrder().clear();
-        avatarTableView.getItems().addAll(
-                avatarService.getAll()
-        );
+    public void refreshAvatars() {
+        avatarsController.refresh();
     }
 
     public void refreshRecentActivity() {
-        userRegistrationFeedTableView.getItems().clear();
-        userRegistrationFeedTableView.getSortOrder().clear();
-        userRegistrationFeedTableView.getItems().addAll(userService.findLatestRegistrations());
-
-        teamkillFeedTableView.getItems().clear();
-        userRegistrationFeedTableView.getSortOrder().clear();
-        teamkillFeedTableView.getItems().addAll(userService.findLatestTeamkills());
-    }
-
-    private void onSelectedUser(ObservableValue<? extends Player> observable, Player oldValue, Player newValue) {
-        userNameHistoryTableView.getItems().clear();
-        userNameHistoryTableView.getSortOrder().clear();
-        userBansTableView.getItems().clear();
-        userBansTableView.getSortOrder().clear();
-        userTeamkillsTableView.getItems().clear();
-        userTeamkillsTableView.getSortOrder().clear();
-        userAvatarsTableView.getItems().clear();
-        userAvatarsTableView.getSortOrder().clear();
-        userLastGamesTable.getItems().clear();
-        userLastGamesTable.getSortOrder().clear();
-
-        if (newValue != null) {
-            userNameHistoryTableView.getItems().addAll(newValue.getNames());
-            userBansTableView.getItems().addAll(newValue.getBans());
-            userTeamkillsTableView.getItems().addAll(userService.findTeamkillsByUserId(newValue.getId()));
-            userAvatarsTableView.getItems().addAll(newValue.getAvatarAssignments());
-
-            userGamesPage = 1;
-            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> gamePlayerStatsMapper.map(userService.getLastHundredPlayedGamesByFeaturedMod(newValue.getId(), userGamesPage, featuredModFilterChoiceBox.getSelectionModel().getSelectedItem())))
-                    .thenAccept(gamePlayerStats -> Platform.runLater(() -> userLastGamesTable.getItems().addAll(gamePlayerStats)));
-            loadMoreGamesRunnable.run();
-        }
-
-        newBanButton.setDisable(newValue == null);
-    }
-
-    public void onUserSearch() {
-        userSearchTableView.getItems().clear();
-        userSearchTableView.getSortOrder().clear();
-
-        Collection<Player> usersFound = Collections.emptyList();
-        String searchPattern = userSearchTextField.getText();
-        if (searchUserByIdRadioButton.isSelected()) {
-            usersFound = userService.findUserById(searchPattern);
-        } else if (searchUserByCurrentNameRadioButton.isSelected()) {
-            usersFound = userService.findUserByName(searchPattern);
-        } else if (searchUserByPreviousNamesRadioButton.isSelected()) {
-            usersFound = userService.findUsersByPreviousName(searchPattern);
-        } else if (searchUserByEmailRadioButton.isSelected()) {
-            usersFound = userService.findUserByEmail(searchPattern);
-        } else if (searchUserBySteamIdRadioButton.isSelected()) {
-            usersFound = userService.findUserBySteamId(searchPattern);
-        } else if (searchUserByIpRadioButton.isSelected()) {
-            usersFound = userService.findUserByIP(searchPattern);
-        }
-
-        userSearchTableView.getItems().addAll(usersFound);
-    }
-
-    public void onRemoveFromLadderPool() {
-        MapTableItemAdapter itemAdapter = ladderPoolView.getSelectionModel().getSelectedItem().getValue();
-        Assert.isTrue(itemAdapter.isMapVersion(), "Only map version can be removed");
-
-        mapService.removeMapVersionFromLadderPool(itemAdapter.getMapVersion().getLadder1v1Map().getId());
-        refreshLadderPool();
-    }
-
-    public void onAddToLadderPool() {
-        MapTableItemAdapter itemAdapter = mapVaultView.getSelectionModel().getSelectedItem().getValue();
-        Assert.isTrue(itemAdapter.isMapVersion(), "Only map version can be added");
-
-        mapService.addMapVersionToLadderPool(itemAdapter.getId());
-        refreshLadderPool();
-    }
-
-    public void onSearchMapVault() {
-        mapVaultView.getRoot().getChildren().clear();
-        mapVaultView.getSortOrder().clear();
-        String mapNamePattern = null;
-
-        if (filterByMapNameCheckBox.isSelected()) {
-            mapNamePattern = mapNamePatternTextField.getText();
-        }
-
-        ViewHelper.fillMapTreeView(mapVaultView,
-                mapService.findMaps(mapNamePattern).stream());
-    }
-
-    public void onSearchMaps() {
-        mapSearchTableView.getItems().clear();
-        mapSearchTableView.getSortOrder().clear();
-
-        List<Map> mapsFound = Collections.emptyList();
-        String searchPattern = mapSearchTextField.getText();
-        if (searchMapByMapNameRadioButton.isSelected()) {
-            mapsFound = mapService.findMapsByName(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
-        } else if (searchMapByAuthorIdRadioButton.isSelected()) {
-            mapsFound = mapService.findMapsByAuthorId(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
-        } else if (searchMapByAuthorNameRadioButton.isSelected()) {
-            mapsFound = mapService.findMapsByAuthorName(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
-        }
-
-        mapSearchTableView.getItems().addAll(mapMapper.map(mapsFound));
-    }
-
-    public void onSearchAvatars() {
-        avatarTableView.getItems().clear();
-        avatarTableView.getSortOrder().clear();
-        Collection<Avatar> avatars;
-        String pattern = searchAvatarsTextField.getText();
-
-        if (searchAvatarsByIdRadioButton.isSelected()) {
-            avatars = avatarService.findAvatarsById(pattern);
-        } else if (searchAvatarsByTooltipRadioButton.isSelected()) {
-            avatars = avatarService.findAvatarsByTooltip(pattern);
-        } else if (searchAvatarsByAssignedUserRadioButton.isSelected()) {
-            avatars = avatarService.findAvatarsByAssignedUser(pattern);
-        } else {
-            avatars = avatarService.getAll();
-        }
-        avatarTableView.getItems().addAll(avatars);
-    }
-
-    public void onNewBan() {
-        Player selectedPlayer = userSearchTableView.getSelectionModel().getSelectedItem();
-        Assert.notNull(selectedPlayer, "Tou need to select a player to create a ban.");
-
-        BanInfoController banInfoController = uiService.loadFxml("ui/banInfo.fxml");
-        banInfoController.setBanInfo(new BanInfo()
-                .setPlayer(selectedPlayer)
-        );
-
-        Stage banInfoDialog = new Stage();
-        banInfoDialog.setTitle("Apply new ban");
-        banInfoDialog.setScene(new Scene(banInfoController.getRoot()));
-        banInfoDialog.showAndWait();
-    }
-
-    public void onEditBan() {
-        BanInfo selectedBan = userBansTableView.getSelectionModel().getSelectedItem();
-        Assert.notNull(selectedBan, "You need to select a ban to edit it.");
-
-        BanInfoController banInfoController = uiService.loadFxml("ui/banInfo.fxml");
-        banInfoController.setBanInfo(selectedBan);
-
-        Stage banInfoDialog = new Stage();
-        banInfoDialog.setTitle("Edit Ban");
-        banInfoDialog.setScene(new Scene(banInfoController.getRoot()));
-        banInfoDialog.showAndWait();
-    }
-
-
-    public void onToggleMapVersionHiding() {
-        MapVersionFX mapVersion = mapVersionTableView.getSelectionModel().getSelectedItem();
-
-        Assert.notNull(mapVersion, "You can only edit a selected MapVersion");
-
-        mapVersion.setHidden(!mapVersion.isHidden());
-        mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
-    }
-
-    public void onToggleMapVersionRanking() {
-        MapVersionFX mapVersion = mapVersionTableView.getSelectionModel().getSelectedItem();
-
-        Assert.notNull(mapVersion, "You can only edit a selected MapVersion");
-
-        mapVersion.setRanked(!mapVersion.isRanked());
-        mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
-    }
-
-    public void loadMoreGames() {
-        userGamesPage++;
-        loadMoreGamesRunnable.run();
+        recentActivityController.refresh();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index 719b82c..786eb55 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -28,12 +28,12 @@
 import java.util.TimeZone;
 import java.util.stream.Stream;
 
-class ViewHelper {
+public class ViewHelper {
     private ViewHelper() {
         // static class
     }
 
-    static void bindMapTreeViewToImageView(TreeTableView<MapTableItemAdapter> mapTreeView, ImageView imageView) {
+    public static void bindMapTreeViewToImageView(TreeTableView<MapTableItemAdapter> mapTreeView, ImageView imageView) {
         mapTreeView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue == null || newValue.getValue() == null) {
                 imageView.setImage(null);
@@ -49,7 +49,7 @@ static void bindMapTreeViewToImageView(TreeTableView<MapTableItemAdapter> mapTre
         });
     }
 
-    static void buildAvatarTableView(TableView<Avatar> tableView) {
+    public static void buildAvatarTableView(TableView<Avatar> tableView) {
         TableColumn<Avatar, String> idColumn = new TableColumn<>("ID");
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -79,7 +79,7 @@ static void buildAvatarTableView(TableView<Avatar> tableView) {
 
     }
 
-    static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView) {
+    public static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView) {
         TableColumn<AvatarAssignment, String> idColumn = new TableColumn<>("ID");
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -122,7 +122,7 @@ static void buildAvatarAssignmentTableView(TableView<AvatarAssignment> tableView
         tableView.getColumns().add(assignedAtColumn);
     }
 
-    static void buildBanTableView(TableView<BanInfo> tableView) {
+    public static void buildBanTableView(TableView<BanInfo> tableView) {
         TableColumn<BanInfo, String> idColumn = new TableColumn<>("ID");
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -188,7 +188,7 @@ static void buildBanTableView(TableView<BanInfo> tableView) {
         tableView.getColumns().add(updateTimeColumn);
     }
 
-    static void buildNameHistoryTableView(TableView<NameRecord> tableView) {
+    public static void buildNameHistoryTableView(TableView<NameRecord> tableView) {
         TableColumn<NameRecord, String> idColumn = new TableColumn<>("ID");
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -206,7 +206,7 @@ static void buildNameHistoryTableView(TableView<NameRecord> tableView) {
         tableView.getColumns().add(nameColumn);
     }
 
-    static void buildTeamkillTableView(javafx.scene.control.TableView<Teamkill> tableView, boolean showKiller) {
+    public static void buildTeamkillTableView(javafx.scene.control.TableView<Teamkill> tableView, boolean showKiller) {
         TableColumn<Teamkill, String> idColumn = new TableColumn<>("ID");
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -242,7 +242,7 @@ static void buildTeamkillTableView(javafx.scene.control.TableView<Teamkill> tabl
         tableView.getColumns().add(reportedAtColumn);
     }
 
-    static void buildUserTableView(TableView<Player> tableView) {
+    public static void buildUserTableView(TableView<Player> tableView) {
         TableColumn<Player, Player> idColumn = new TableColumn<>("ID");
         idColumn.setCellValueFactory(param -> new SimpleObjectProperty<>(param.getValue()));
         idColumn.setCellFactory(param -> new TableCell<Player, Player>() {
@@ -327,7 +327,7 @@ protected void updateItem(Player item, boolean empty) {
         tableView.getColumns().add(userAgentColumn);
     }
 
-    static void buildUserAvatarsTableView(TableView<AvatarAssignment> tableView) {
+    public static void buildUserAvatarsTableView(TableView<AvatarAssignment> tableView) {
         TableColumn<AvatarAssignment, String> idColumn = new TableColumn<>("Assignment ID");
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
         idColumn.setCellValueFactory(new PropertyValueFactory<>("id"));
@@ -370,7 +370,7 @@ static void buildUserAvatarsTableView(TableView<AvatarAssignment> tableView) {
         tableView.getColumns().add(expiresAtColumn);
     }
 
-    static void buildMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView) {
+    public static void buildMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView) {
         TreeTableColumn<MapTableItemAdapter, String> idColumn = new TreeTableColumn<>("ID");
         idColumn.setCellValueFactory(new TreeItemPropertyValueFactory<>("id"));
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -409,7 +409,7 @@ static void buildMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView) {
         mapTreeView.setShowRoot(false);
     }
 
-    static void buildMapTableView(TableView<MapFX> tableView) {
+    public static void buildMapTableView(TableView<MapFX> tableView) {
         TableColumn<MapFX, String> idColumn = new TableColumn<>("Map ID");
         idColumn.setCellValueFactory(o -> o.getValue().idProperty());
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -459,7 +459,7 @@ protected void updateItem(PlayerFX item, boolean empty) {
         tableView.getColumns().add(updateTimeColumn);
     }
 
-    static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView, String replayDownloadFormat, PlatformService platformService) {
+    public static void buildPlayersGamesTable(TableView<GamePlayerStatsFX> tableView, String replayDownloadFormat, PlatformService platformService) {
         TableColumn<GamePlayerStatsFX, String> gameIdColumn = new TableColumn<>("Game ID");
         gameIdColumn.setCellValueFactory(o -> o.getValue().getGame().idProperty());
         gameIdColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -538,7 +538,7 @@ protected void updateItem(String item, boolean empty) {
         tableView.getColumns().add(replayUrlColumn);
     }
 
-    static void buildMapVersionTableView(TableView<MapVersionFX> tableView) {
+    public static void buildMapVersionTableView(TableView<MapVersionFX> tableView) {
         TableColumn<MapVersionFX, String> idColumn = new TableColumn<>("Version ID");
         idColumn.setCellValueFactory(o -> o.getValue().idProperty());
         idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
@@ -591,7 +591,7 @@ static void buildMapVersionTableView(TableView<MapVersionFX> tableView) {
         tableView.getColumns().add(updateTimeColumn);
     }
 
-    static void fillMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView, Stream<Map> mapStream) {
+    public static void fillMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeView, Stream<Map> mapStream) {
         mapStream.forEach(map -> {
             TreeItem<MapTableItemAdapter> mapItem = new TreeItem<>(new MapTableItemAdapter(map));
             mapTreeView.getRoot().getChildren().add(mapItem);
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/AvatarsController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/AvatarsController.java
new file mode 100644
index 0000000..920166c
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/AvatarsController.java
@@ -0,0 +1,78 @@
+package com.faforever.moderatorclient.ui.main_window;
+
+import com.faforever.moderatorclient.api.dto.Avatar;
+import com.faforever.moderatorclient.api.dto.AvatarAssignment;
+import com.faforever.moderatorclient.api.rest.domain.AvatarService;
+import com.faforever.moderatorclient.ui.Controller;
+import com.faforever.moderatorclient.ui.ViewHelper;
+import javafx.fxml.FXML;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Optional;
+
+@Slf4j
+@Component
+public class AvatarsController implements Controller<SplitPane> {
+    private final AvatarService avatarService;
+
+    public SplitPane root;
+    public TableView<Avatar> avatarTableView;
+    public TableView<AvatarAssignment> avatarAssignmentTableView;
+    public RadioButton showAllAvatarsRadioButton;
+    public RadioButton searchAvatarsByIdRadioButton;
+    public RadioButton searchAvatarsByTooltipRadioButton;
+    public RadioButton searchAvatarsByAssignedUserRadioButton;
+    public TextField searchAvatarsTextField;
+
+    public AvatarsController(AvatarService avatarService) {
+        this.avatarService = avatarService;
+    }
+
+    @Override
+    public SplitPane getRoot() {
+        return root;
+    }
+
+    @FXML
+    public void initialize() {
+        ViewHelper.buildAvatarTableView(avatarTableView);
+        ViewHelper.buildAvatarAssignmentTableView(avatarAssignmentTableView);
+
+        avatarTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            avatarAssignmentTableView.getItems().clear();
+            Optional.ofNullable(newValue).ifPresent(avatar -> avatarAssignmentTableView.getItems().addAll(avatar.getAssignments()));
+        });
+    }
+
+    public void refresh() {
+        avatarTableView.getItems().clear();
+        avatarTableView.getSortOrder().clear();
+        avatarTableView.getItems().addAll(
+                avatarService.getAll()
+        );
+    }
+
+    public void onSearchAvatars() {
+        avatarTableView.getItems().clear();
+        avatarTableView.getSortOrder().clear();
+        Collection<Avatar> avatars;
+        String pattern = searchAvatarsTextField.getText();
+
+        if (searchAvatarsByIdRadioButton.isSelected()) {
+            avatars = avatarService.findAvatarsById(pattern);
+        } else if (searchAvatarsByTooltipRadioButton.isSelected()) {
+            avatars = avatarService.findAvatarsByTooltip(pattern);
+        } else if (searchAvatarsByAssignedUserRadioButton.isSelected()) {
+            avatars = avatarService.findAvatarsByAssignedUser(pattern);
+        } else {
+            avatars = avatarService.getAll();
+        }
+        avatarTableView.getItems().addAll(avatars);
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/LadderMapPoolController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/LadderMapPoolController.java
new file mode 100644
index 0000000..fd80142
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/LadderMapPoolController.java
@@ -0,0 +1,109 @@
+package com.faforever.moderatorclient.ui.main_window;
+
+import com.faforever.moderatorclient.api.rest.domain.MapService;
+import com.faforever.moderatorclient.mapstruct.MapMapper;
+import com.faforever.moderatorclient.mapstruct.MapVersionMapper;
+import com.faforever.moderatorclient.ui.Controller;
+import com.faforever.moderatorclient.ui.MapTableItemAdapter;
+import com.faforever.moderatorclient.ui.ViewHelper;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+@Slf4j
+@Component
+public class LadderMapPoolController implements Controller<SplitPane> {
+    private final MapService mapService;
+    private final MapMapper mapMapper;
+    private final MapVersionMapper mapVersionMapper;
+
+    public SplitPane root;
+
+    public TreeTableView<MapTableItemAdapter> ladderPoolView;
+    public TreeTableView<MapTableItemAdapter> mapVaultView;
+    public CheckBox filterByMapNameCheckBox;
+    public TextField mapNamePatternTextField;
+    public ImageView ladderPoolImageView;
+    public ImageView mapVaultImageView;
+    public Button removeFromPoolButton;
+    public Button addToPoolButton;
+
+    public LadderMapPoolController(MapService mapService, MapMapper mapMapper, MapVersionMapper mapVersionMapper) {
+        this.mapService = mapService;
+        this.mapMapper = mapMapper;
+        this.mapVersionMapper = mapVersionMapper;
+    }
+
+    @Override
+    public SplitPane getRoot() {
+        return root;
+    }
+
+    @FXML
+    public void initialize() {
+        ViewHelper.buildMapTreeView(ladderPoolView);
+        ViewHelper.bindMapTreeViewToImageView(ladderPoolView, ladderPoolImageView);
+
+        ladderPoolView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue == null || newValue.getValue() == null) {
+                removeFromPoolButton.setDisable(true);
+            } else {
+                removeFromPoolButton.setDisable(!newValue.getValue().isMapVersion());
+            }
+        });
+
+        ViewHelper.buildMapTreeView(mapVaultView);
+        ViewHelper.bindMapTreeViewToImageView(mapVaultView, mapVaultImageView);
+        mapVaultView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue == null || newValue.getValue() == null) {
+                addToPoolButton.setDisable(true);
+            } else {
+                addToPoolButton.setDisable(!newValue.getValue().isMapVersion());
+            }
+        });
+    }
+
+    public void refresh() {
+        ladderPoolView.getRoot().getChildren().clear();
+        ladderPoolView.getSortOrder().clear();
+        mapService.findMapsInLadder1v1Pool()
+                .forEach(map -> {
+                    TreeItem<MapTableItemAdapter> mapItem = new TreeItem<>(new MapTableItemAdapter(map));
+                    ladderPoolView.getRoot().getChildren().add(mapItem);
+
+                    map.getVersions().forEach(mapVersion -> mapItem.getChildren().add(new TreeItem<>(new MapTableItemAdapter(mapVersion))));
+                });
+    }
+
+    public void onSearchMapVault() {
+        mapVaultView.getRoot().getChildren().clear();
+        mapVaultView.getSortOrder().clear();
+        String mapNamePattern = null;
+
+        if (filterByMapNameCheckBox.isSelected()) {
+            mapNamePattern = mapNamePatternTextField.getText();
+        }
+
+        ViewHelper.fillMapTreeView(mapVaultView,
+                mapService.findMaps(mapNamePattern).stream());
+    }
+
+    public void onRemoveFromLadderPool() {
+        MapTableItemAdapter itemAdapter = ladderPoolView.getSelectionModel().getSelectedItem().getValue();
+        Assert.isTrue(itemAdapter.isMapVersion(), "Only map version can be removed");
+
+        mapService.removeMapVersionFromLadderPool(itemAdapter.getMapVersion().getLadder1v1Map().getId());
+        refresh();
+    }
+
+    public void onAddToLadderPool() {
+        MapTableItemAdapter itemAdapter = mapVaultView.getSelectionModel().getSelectedItem().getValue();
+        Assert.isTrue(itemAdapter.isMapVersion(), "Only map version can be added");
+
+        mapService.addMapVersionToLadderPool(itemAdapter.getId());
+        refresh();
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/MapVaultController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/MapVaultController.java
new file mode 100644
index 0000000..3e2de94
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/MapVaultController.java
@@ -0,0 +1,112 @@
+package com.faforever.moderatorclient.ui.main_window;
+
+import com.faforever.moderatorclient.api.dto.Map;
+import com.faforever.moderatorclient.api.rest.domain.MapService;
+import com.faforever.moderatorclient.mapstruct.MapMapper;
+import com.faforever.moderatorclient.mapstruct.MapVersionMapper;
+import com.faforever.moderatorclient.ui.Controller;
+import com.faforever.moderatorclient.ui.ViewHelper;
+import com.faforever.moderatorclient.ui.domain.MapFX;
+import com.faforever.moderatorclient.ui.domain.MapVersionFX;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+@Slf4j
+@Component
+public class MapVaultController implements Controller<SplitPane> {
+    private final MapService mapService;
+    private final MapMapper mapMapper;
+    private final MapVersionMapper mapVersionMapper;
+
+    public SplitPane root;
+
+    public RadioButton searchMapByMapNameRadioButton;
+    public RadioButton searchMapByAuthorIdRadioButton;
+    public RadioButton searchMapByAuthorNameRadioButton;
+    public TextField mapSearchTextField;
+    public CheckBox excludeHiddenMapVersionsCheckbox;
+    public ImageView mapVersionPreviewImageView;
+    public TableView<MapFX> mapSearchTableView;
+    public TableView<MapVersionFX> mapVersionTableView;
+    public Button toggleMapVersionHidingButton;
+    public Button toggleMapVersionRatingButton;
+
+    public MapVaultController(MapService mapService, MapMapper mapMapper, MapVersionMapper mapVersionMapper) {
+        this.mapService = mapService;
+        this.mapMapper = mapMapper;
+        this.mapVersionMapper = mapVersionMapper;
+    }
+
+    @Override
+    public SplitPane getRoot() {
+        return root;
+    }
+
+    @FXML
+    public void initialize() {
+        ViewHelper.buildMapTableView(mapSearchTableView);
+        ViewHelper.buildMapVersionTableView(mapVersionTableView);
+
+        mapSearchTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            mapVersionTableView.getItems().clear();
+            Optional.ofNullable(newValue).ifPresent(map -> mapVersionTableView.getItems().addAll(
+                    map.getVersions()));
+        });
+
+        mapVersionTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue == null) {
+                mapVersionPreviewImageView.setImage(null);
+                toggleMapVersionHidingButton.setDisable(true);
+                toggleMapVersionRatingButton.setDisable(true);
+            } else {
+                mapVersionPreviewImageView.setImage(new Image(newValue.getThumbnailUrlLarge().toString()));
+                toggleMapVersionHidingButton.setDisable(false);
+                toggleMapVersionRatingButton.setDisable(false);
+            }
+        });
+    }
+
+    public void onSearchMaps() {
+        mapSearchTableView.getItems().clear();
+        mapSearchTableView.getSortOrder().clear();
+
+        List<Map> mapsFound = Collections.emptyList();
+        String searchPattern = mapSearchTextField.getText();
+        if (searchMapByMapNameRadioButton.isSelected()) {
+            mapsFound = mapService.findMapsByName(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
+        } else if (searchMapByAuthorIdRadioButton.isSelected()) {
+            mapsFound = mapService.findMapsByAuthorId(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
+        } else if (searchMapByAuthorNameRadioButton.isSelected()) {
+            mapsFound = mapService.findMapsByAuthorName(searchPattern, excludeHiddenMapVersionsCheckbox.isSelected());
+        }
+
+        mapSearchTableView.getItems().addAll(mapMapper.map(mapsFound));
+    }
+
+    public void onToggleMapVersionHiding() {
+        MapVersionFX mapVersion = mapVersionTableView.getSelectionModel().getSelectedItem();
+
+        Assert.notNull(mapVersion, "You can only edit a selected MapVersion");
+
+        mapVersion.setHidden(!mapVersion.isHidden());
+        mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
+    }
+
+    public void onToggleMapVersionRanking() {
+        MapVersionFX mapVersion = mapVersionTableView.getSelectionModel().getSelectedItem();
+
+        Assert.notNull(mapVersion, "You can only edit a selected MapVersion");
+
+        mapVersion.setRanked(!mapVersion.isRanked());
+        mapService.patchMapVersion(mapVersionMapper.map(mapVersion));
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/RecentActivityController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/RecentActivityController.java
new file mode 100644
index 0000000..25fb3cd
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/RecentActivityController.java
@@ -0,0 +1,47 @@
+package com.faforever.moderatorclient.ui.main_window;
+
+import com.faforever.moderatorclient.api.dto.Player;
+import com.faforever.moderatorclient.api.dto.Teamkill;
+import com.faforever.moderatorclient.api.rest.domain.UserService;
+import com.faforever.moderatorclient.ui.Controller;
+import com.faforever.moderatorclient.ui.ViewHelper;
+import javafx.fxml.FXML;
+import javafx.scene.control.TableView;
+import javafx.scene.layout.VBox;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class RecentActivityController implements Controller<VBox> {
+    private final UserService userService;
+
+    public VBox root;
+    public TableView<Player> userRegistrationFeedTableView;
+    public TableView<Teamkill> teamkillFeedTableView;
+
+    public RecentActivityController(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    public VBox getRoot() {
+        return root;
+    }
+
+    @FXML
+    public void initialize() {
+        ViewHelper.buildUserTableView(userRegistrationFeedTableView);
+        ViewHelper.buildTeamkillTableView(teamkillFeedTableView, true);
+    }
+
+    public void refresh() {
+        userRegistrationFeedTableView.getItems().clear();
+        userRegistrationFeedTableView.getSortOrder().clear();
+        userRegistrationFeedTableView.getItems().addAll(userService.findLatestRegistrations());
+
+        teamkillFeedTableView.getItems().clear();
+        userRegistrationFeedTableView.getSortOrder().clear();
+        teamkillFeedTableView.getItems().addAll(userService.findLatestTeamkills());
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
new file mode 100644
index 0000000..7f9d075
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
@@ -0,0 +1,195 @@
+package com.faforever.moderatorclient.ui.main_window;
+
+import com.faforever.moderatorclient.api.dto.*;
+import com.faforever.moderatorclient.api.rest.domain.UserService;
+import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
+import com.faforever.moderatorclient.mapstruct.PlayerMapper;
+import com.faforever.moderatorclient.ui.*;
+import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
+import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.control.*;
+import javafx.stage.Stage;
+import javafx.util.StringConverter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+
+@Slf4j
+@Component
+public class UserManagementController implements Controller<SplitPane> {
+    private final UiService uiService;
+    private final PlatformService platformService;
+    private final UserService userService;
+    private final PlayerMapper playerMapper;
+    private final GamePlayerStatsMapper gamePlayerStatsMapper;
+
+    private final String replayDownLoadFormat;
+
+    public SplitPane root;
+
+    public RadioButton searchUserByIdRadioButton;
+    public RadioButton searchUserByCurrentNameRadioButton;
+    public RadioButton searchUserByPreviousNamesRadioButton;
+    public RadioButton searchUserByEmailRadioButton;
+    public RadioButton searchUserBySteamIdRadioButton;
+    public RadioButton searchUserByIpRadioButton;
+    public TextField userSearchTextField;
+    public Button newBanButton;
+    public Button editBanButton;
+    public TableView<Player> userSearchTableView;
+    public TableView<NameRecord> userNameHistoryTableView;
+    public TableView<BanInfo> userBansTableView;
+    public TableView<Teamkill> userTeamkillsTableView;
+    public TableView<AvatarAssignment> userAvatarsTableView;
+    public TableView<GamePlayerStatsFX> userLastGamesTable;
+    public ChoiceBox<FeaturedModFX> featuredModFilterChoiceBox;
+    public Button loadMoreGamesButton;
+    private Runnable loadMoreGamesRunnable;
+    private int userGamesPage = 1;
+
+    public UserManagementController(UiService uiService, PlatformService platformService, UserService userService, PlayerMapper playerMapper, GamePlayerStatsMapper gamePlayerStatsMapper, @Value("${faforever.vault.replayDownloadUrlFormat}") String replayDownLoadFormat) {
+        this.uiService = uiService;
+        this.platformService = platformService;
+        this.userService = userService;
+        this.playerMapper = playerMapper;
+        this.gamePlayerStatsMapper = gamePlayerStatsMapper;
+        this.replayDownLoadFormat = replayDownLoadFormat;
+    }
+
+    @Override
+    public SplitPane getRoot() {
+        return root;
+    }
+
+    @FXML
+    public void initialize() {
+        ViewHelper.buildUserTableView(userSearchTableView);
+        ViewHelper.buildNameHistoryTableView(userNameHistoryTableView);
+        ViewHelper.buildBanTableView(userBansTableView);
+        ViewHelper.buildPlayersGamesTable(userLastGamesTable, replayDownLoadFormat, platformService);
+
+        loadMoreGamesButton.visibleProperty()
+                .bind(Bindings.createBooleanBinding(() -> userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0, userLastGamesTable.getItems()));
+
+        featuredModFilterChoiceBox.setConverter(new StringConverter<FeaturedModFX>() {
+            @Override
+            public String toString(FeaturedModFX object) {
+                return object == null ? "All" : object.getDisplayName();
+            }
+
+            @Override
+            public FeaturedModFX fromString(String string) {
+                throw (new UnsupportedOperationException("Not implemented"));
+            }
+        });
+        featuredModFilterChoiceBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            userLastGamesTable.getItems().clear();
+            userGamesPage = 1;
+            if (loadMoreGamesRunnable != null) loadMoreGamesRunnable.run();
+        });
+
+        featuredModFilterChoiceBox.getItems().add(null);
+        featuredModFilterChoiceBox.getSelectionModel().select(0);
+        CompletableFuture.supplyAsync(userService::getFeaturedMods)
+                .thenAccept(featuredMods -> Platform.runLater(() -> featuredModFilterChoiceBox.getItems().addAll(featuredMods)));
+
+        ViewHelper.buildTeamkillTableView(userTeamkillsTableView, false);
+        ViewHelper.buildUserAvatarsTableView(userAvatarsTableView);
+
+        userSearchTableView.getSelectionModel().selectedItemProperty().addListener(this::onSelectedUser);
+        userBansTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> editBanButton.setDisable(newValue == null));
+    }
+
+    private void onSelectedUser(ObservableValue<? extends Player> observable, Player oldValue, Player newValue) {
+        userNameHistoryTableView.getItems().clear();
+        userNameHistoryTableView.getSortOrder().clear();
+        userBansTableView.getItems().clear();
+        userBansTableView.getSortOrder().clear();
+        userTeamkillsTableView.getItems().clear();
+        userTeamkillsTableView.getSortOrder().clear();
+        userAvatarsTableView.getItems().clear();
+        userAvatarsTableView.getSortOrder().clear();
+        userLastGamesTable.getItems().clear();
+        userLastGamesTable.getSortOrder().clear();
+
+        if (newValue != null) {
+            userNameHistoryTableView.getItems().addAll(newValue.getNames());
+            userBansTableView.getItems().addAll(newValue.getBans());
+            userTeamkillsTableView.getItems().addAll(userService.findTeamkillsByUserId(newValue.getId()));
+            userAvatarsTableView.getItems().addAll(newValue.getAvatarAssignments());
+
+            userGamesPage = 1;
+            loadMoreGamesRunnable = () -> CompletableFuture.supplyAsync(() -> gamePlayerStatsMapper.map(userService.getLastHundredPlayedGamesByFeaturedMod(newValue.getId(), userGamesPage, featuredModFilterChoiceBox.getSelectionModel().getSelectedItem())))
+                    .thenAccept(gamePlayerStats -> Platform.runLater(() -> userLastGamesTable.getItems().addAll(gamePlayerStats)));
+            loadMoreGamesRunnable.run();
+        }
+
+        newBanButton.setDisable(newValue == null);
+    }
+
+    public void onUserSearch() {
+        userSearchTableView.getItems().clear();
+        userSearchTableView.getSortOrder().clear();
+
+        Collection<Player> usersFound = Collections.emptyList();
+        String searchPattern = userSearchTextField.getText();
+        if (searchUserByIdRadioButton.isSelected()) {
+            usersFound = userService.findUserById(searchPattern);
+        } else if (searchUserByCurrentNameRadioButton.isSelected()) {
+            usersFound = userService.findUserByName(searchPattern);
+        } else if (searchUserByPreviousNamesRadioButton.isSelected()) {
+            usersFound = userService.findUsersByPreviousName(searchPattern);
+        } else if (searchUserByEmailRadioButton.isSelected()) {
+            usersFound = userService.findUserByEmail(searchPattern);
+        } else if (searchUserBySteamIdRadioButton.isSelected()) {
+            usersFound = userService.findUserBySteamId(searchPattern);
+        } else if (searchUserByIpRadioButton.isSelected()) {
+            usersFound = userService.findUserByIP(searchPattern);
+        }
+
+        userSearchTableView.getItems().addAll(usersFound);
+    }
+
+    public void onNewBan() {
+        Player selectedPlayer = userSearchTableView.getSelectionModel().getSelectedItem();
+        Assert.notNull(selectedPlayer, "Tou need to select a player to create a ban.");
+
+        BanInfoController banInfoController = uiService.loadFxml("ui/banInfo.fxml");
+        banInfoController.setBanInfo(new BanInfo()
+                .setPlayer(selectedPlayer)
+        );
+
+        Stage banInfoDialog = new Stage();
+        banInfoDialog.setTitle("Apply new ban");
+        banInfoDialog.setScene(new Scene(banInfoController.getRoot()));
+        banInfoDialog.showAndWait();
+    }
+
+    public void onEditBan() {
+        BanInfo selectedBan = userBansTableView.getSelectionModel().getSelectedItem();
+        Assert.notNull(selectedBan, "You need to select a ban to edit it.");
+
+        BanInfoController banInfoController = uiService.loadFxml("ui/banInfo.fxml");
+        banInfoController.setBanInfo(selectedBan);
+
+        Stage banInfoDialog = new Stage();
+        banInfoDialog.setTitle("Edit Ban");
+        banInfoDialog.setScene(new Scene(banInfoController.getRoot()));
+        banInfoDialog.showAndWait();
+    }
+
+    public void loadMoreGames() {
+        userGamesPage++;
+        loadMoreGamesRunnable.run();
+    }
+}
diff --git a/src/main/resources/ui/mainWindow.fxml b/src/main/resources/ui/mainWindow.fxml
index edba8e3..52fb317 100644
--- a/src/main/resources/ui/mainWindow.fxml
+++ b/src/main/resources/ui/mainWindow.fxml
@@ -1,533 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.Font?>
 <TabPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" maxHeight="1.7976931348623157E308"
          maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="700.0"
          prefWidth="1200.0" xmlns="http://javafx.com/javafx/8.0.111"
          fx:controller="com.faforever.moderatorclient.ui.MainController">
     <tabs>
-        <Tab closable="false" text="User Management">
-            <content>
-                <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
-                    <items>
-                        <HBox>
-                            <children>
-                                <VBox minWidth="220.0">
-                                    <children>
-                                        <RadioButton fx:id="searchUserByCurrentNameRadioButton" mnemonicParsing="false"
-                                                     selected="true" text="search by current name">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                            <toggleGroup>
-                                                <ToggleGroup fx:id="userSearch"/>
-                                            </toggleGroup>
-                                        </RadioButton>
-                                        <RadioButton fx:id="searchUserByPreviousNamesRadioButton"
-                                                     mnemonicParsing="false" text="search by previous names"
-                                                     toggleGroup="$userSearch">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </RadioButton>
-                                        <RadioButton fx:id="searchUserByIdRadioButton" mnemonicParsing="false"
-                                                     text="search by id" toggleGroup="$userSearch">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </RadioButton>
-                                        <RadioButton fx:id="searchUserByEmailRadioButton" mnemonicParsing="false"
-                                                     text="search by email" toggleGroup="$userSearch">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </RadioButton>
-                                        <RadioButton fx:id="searchUserBySteamIdRadioButton" mnemonicParsing="false"
-                                                     text="search by Steam ID" toggleGroup="$userSearch">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </RadioButton>
-                                        <RadioButton fx:id="searchUserByIpRadioButton" mnemonicParsing="false"
-                                                     text="search by IP address" toggleGroup="$userSearch">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </RadioButton>
-                                        <TextField fx:id="userSearchTextField">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </TextField>
-                                        <Button mnemonicParsing="false" onAction="#onUserSearch" text="search user">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </Button>
-                                    </children>
-                                    <HBox.margin>
-                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                    </HBox.margin>
-                                </VBox>
-                                <TableView fx:id="userSearchTableView" maxHeight="1.7976931348623157E308"
-                                           maxWidth="1.7976931348623157E308" minWidth="550.0" prefHeight="200.0"
-                                           HBox.hgrow="ALWAYS"/>
-                            </children>
-                        </HBox>
-                        <TabPane minHeight="200.0" tabClosingPolicy="UNAVAILABLE">
-                            <tabs>
-                                <Tab text="Bans">
-                                    <content>
-                                        <VBox>
-                                            <children>
-                                                <TableView fx:id="userBansTableView" prefHeight="200.0"
-                                                           prefWidth="200.0" VBox.vgrow="ALWAYS">
-                                                    <VBox.margin>
-                                                        <Insets bottom="10.0"/>
-                                                    </VBox.margin>
-                                                </TableView>
-                                                <HBox alignment="CENTER">
-                                                    <children>
-                                                        <Button fx:id="newBanButton" disable="true"
-                                                                mnemonicParsing="false" onAction="#onNewBan"
-                                                                text="Apply new ban">
-                                                            <HBox.margin>
-                                                                <Insets/>
-                                                            </HBox.margin>
-                                                        </Button>
-                                                        <Button fx:id="editBanButton" disable="true"
-                                                                mnemonicParsing="false" onAction="#onEditBan"
-                                                                text="Edit selected ban">
-                                                            <HBox.margin>
-                                                                <Insets left="10.0"/>
-                                                            </HBox.margin>
-                                                        </Button>
-                                                    </children>
-                                                    <VBox.margin>
-                                                        <Insets/>
-                                                    </VBox.margin>
-                                                    <padding>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </padding>
-                                                </HBox>
-                                            </children>
-                                        </VBox>
-                                    </content>
-                                </Tab>
-                                <Tab text="Teamkills">
-                                    <content>
-                                        <TableView fx:id="userTeamkillsTableView" prefHeight="200.0" prefWidth="200.0"/>
-                                    </content>
-                                </Tab>
-                                <Tab text="Name History">
-                                    <content>
-                                        <TableView fx:id="userNameHistoryTableView" maxHeight="1.7976931348623157E308"
-                                                   maxWidth="1.7976931348623157E308" prefHeight="200.0"/>
-                                    </content>
-                                </Tab>
-                                <Tab text="Last Games">
-                                    <content>
-                                        <VBox>
-                                            <HBox spacing="10">
-                                                <Label maxHeight="1.7976931348623157E308"
-                                                       maxWidth="1.7976931348623157E308" text="Show featured Mods:"/>
-                                                <ChoiceBox fx:id="featuredModFilterChoiceBox" minWidth="150.0"/>
-                                                <Button fx:id="loadMoreGamesButton" onAction="#loadMoreGames"
-                                                        text="Load more"/>
-                                                <VBox.margin>
-                                                    <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                </VBox.margin>
-                                            </HBox>
-                                            <TableView fx:id="userLastGamesTable" maxHeight="1.7976931348623157E308"
-                                                       maxWidth="1.7976931348623157E308" VBox.vgrow="ALWAYS"/>
-                                        </VBox>
-                                    </content>
-                                </Tab>
-                                <Tab text="Avatars">
-                                    <content>
-                                        <TableView fx:id="userAvatarsTableView" prefHeight="200.0" prefWidth="200.0"/>
-                                    </content>
-                                </Tab>
-                            </tabs>
-                        </TabPane>
-                    </items>
-                </SplitPane>
-            </content>
-        </Tab>
-        <Tab closable="false" text="Ladder Map Pool">
-            <content>
-                <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
-                    <items>
-                        <VBox>
-                            <children>
-                                <Label text="Current ladder pool">
-                                    <padding>
-                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                    </padding>
-                                    <font>
-                                        <Font name="System Bold" size="15.0"/>
-                                    </font>
-                                </Label>
-                                <HBox prefWidth="700.0">
-                                    <children>
-                                        <TreeTableView fx:id="ladderPoolView" HBox.hgrow="ALWAYS"/>
-                                        <ImageView fx:id="ladderPoolImageView" fitHeight="150.0" fitWidth="200.0"
-                                                   pickOnBounds="true" preserveRatio="true"/>
-                                    </children>
-                                </HBox>
-                                <HBox alignment="CENTER" maxHeight="1.7976931348623157E308"
-                                      maxWidth="1.7976931348623157E308">
-                                    <children>
-                                        <Button fx:id="removeFromPoolButton" alignment="CENTER" disable="true"
-                                                mnemonicParsing="false" onAction="#onRemoveFromLadderPool"
-                                                text="remove selected map from pool" HBox.hgrow="ALWAYS">
-                                            <HBox.margin>
-                                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                            </HBox.margin>
-                                        </Button>
-                                    </children>
-                                </HBox>
-                            </children>
-                        </VBox>
-                        <VBox>
-                            <children>
-                                <HBox>
-                                    <children>
-                                        <Label text="Map vault">
-                                            <padding>
-                                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                            </padding>
-                                            <font>
-                                                <Font name="System Bold" size="15.0"/>
-                                            </font>
-                                        </Label>
-                                        <Label text="(only ranked and not hidden maps)">
-                                            <padding>
-                                                <Insets bottom="10.0" right="10.0" top="10.0"/>
-                                            </padding>
-                                        </Label>
-                                    </children>
-                                </HBox>
-                                <HBox alignment="CENTER_LEFT">
-                                    <children>
-                                        <CheckBox fx:id="filterByMapNameCheckBox" mnemonicParsing="false"
-                                                  text="filter by map name:">
-                                            <padding>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </padding>
-                                            <HBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </HBox.margin>
-                                        </CheckBox>
-                                        <TextField fx:id="mapNamePatternTextField">
-                                            <padding>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </padding>
-                                            <HBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </HBox.margin>
-                                        </TextField>
-                                        <Button mnemonicParsing="false" onAction="#onSearchMapVault"
-                                                text="search vault">
-                                            <padding>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </padding>
-                                            <HBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </HBox.margin>
-                                        </Button>
-                                    </children>
-                                </HBox>
-                                <HBox alignment="CENTER_LEFT" prefWidth="200.0"/>
-                                <HBox alignment="CENTER_LEFT" prefWidth="200.0"/>
-                                <HBox>
-                                    <children>
-                                        <TreeTableView fx:id="mapVaultView" HBox.hgrow="ALWAYS"/>
-                                        <ImageView fx:id="mapVaultImageView" fitHeight="150.0" fitWidth="200.0"
-                                                   pickOnBounds="true" preserveRatio="true"/>
-                                    </children>
-                                </HBox>
-                                <HBox alignment="CENTER">
-                                    <children>
-                                        <Button fx:id="addToPoolButton" disable="true" mnemonicParsing="false"
-                                                onAction="#onAddToLadderPool" text="add selected map to pool">
-                                            <HBox.margin>
-                                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                            </HBox.margin>
-                                        </Button>
-                                    </children>
-                                </HBox>
-                            </children>
-                        </VBox>
-                    </items>
-                </SplitPane>
-            </content>
-        </Tab>
-        <Tab closable="false" text="Map vault">
-            <content>
-                <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
-                    <items>
-                        <TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE">
-                            <tabs>
-                                <Tab closable="false" text="Search">
-                                    <content>
-                                        <HBox prefHeight="100.0" prefWidth="200.0">
-                                            <children>
-                                                <VBox minWidth="220.0">
-                                                    <children>
-                                                        <RadioButton fx:id="searchMapByMapNameRadioButton"
-                                                                     mnemonicParsing="false" text="search by name">
-                                                            <VBox.margin>
-                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                            </VBox.margin>
-                                                            <toggleGroup>
-                                                                <ToggleGroup fx:id="mapSearch"/>
-                                                            </toggleGroup>
-                                                        </RadioButton>
-                                                        <RadioButton fx:id="searchMapByAuthorIdRadioButton"
-                                                                     mnemonicParsing="false" text="search by author id"
-                                                                     toggleGroup="$mapSearch">
-                                                            <padding>
-                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                            </padding>
-                                                        </RadioButton>
-                                                        <RadioButton fx:id="searchMapByAuthorNameRadioButton"
-                                                                     mnemonicParsing="false"
-                                                                     text="search by author name"
-                                                                     toggleGroup="$mapSearch">
-                                                            <padding>
-                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                            </padding>
-                                                        </RadioButton>
-                                                        <TextField fx:id="mapSearchTextField">
-                                                            <VBox.margin>
-                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                            </VBox.margin>
-                                                        </TextField>
-                                                        <CheckBox fx:id="excludeHiddenMapVersionsCheckbox"
-                                                                  mnemonicParsing="false" selected="true"
-                                                                  text="no hidden map versions">
-                                                            <VBox.margin>
-                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                            </VBox.margin>
-                                                        </CheckBox>
-                                                        <Button mnemonicParsing="false" onAction="#onSearchMaps"
-                                                                text="search map">
-                                                            <VBox.margin>
-                                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                            </VBox.margin>
-                                                        </Button>
-                                                    </children>
-                                                    <HBox.margin>
-                                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                                    </HBox.margin>
-                                                </VBox>
-                                                <VBox HBox.hgrow="ALWAYS">
-                                                    <children>
-                                                        <Label alignment="CENTER" maxHeight="1.7976931348623157E308"
-                                                               maxWidth="1.7976931348623157E308"
-                                                               style="-fx-background-color: #ccc;" text="Maps">
-                                                            <padding>
-                                                                <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
-                                                            </padding>
-                                                            <font>
-                                                                <Font name="System Bold" size="15.0"/>
-                                                            </font>
-                                                        </Label>
-                                                        <TableView fx:id="mapSearchTableView" prefHeight="200.0"
-                                                                   prefWidth="200.0" VBox.vgrow="ALWAYS"/>
-                                                    </children>
-                                                </VBox>
-                                            </children>
-                                        </HBox>
-                                    </content>
-                                </Tab>
-                            </tabs>
-                        </TabPane>
-                        <HBox>
-                            <children>
-                                <VBox alignment="CENTER" prefWidth="220.0">
-                                    <HBox.margin>
-                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                    </HBox.margin>
-                                    <children>
-                                        <ImageView fx:id="mapVersionPreviewImageView" fitHeight="150.0" fitWidth="200.0"
-                                                   pickOnBounds="true" preserveRatio="true">
-                                            <VBox.margin>
-                                                <Insets bottom="25.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </ImageView>
-                                        <Button fx:id="toggleMapVersionRatingButton" disable="true"
-                                                mnemonicParsing="false" onAction="#onToggleMapVersionRanking"
-                                                text="rank / unrank">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </Button>
-                                        <Button fx:id="toggleMapVersionHidingButton" disable="true"
-                                                mnemonicParsing="false" onAction="#onToggleMapVersionHiding"
-                                                text="hide / unhide">
-                                            <VBox.margin>
-                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                            </VBox.margin>
-                                        </Button>
-                                    </children>
-                                </VBox>
-                                <VBox HBox.hgrow="ALWAYS">
-                                    <children>
-                                        <Label alignment="CENTER" maxHeight="1.7976931348623157E308"
-                                               maxWidth="1.7976931348623157E308" style="-fx-background-color: #ccc;"
-                                               text="Map Versions">
-                                            <VBox.margin>
-                                                <Insets/>
-                                            </VBox.margin>
-                                            <padding>
-                                                <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
-                                            </padding>
-                                            <font>
-                                                <Font name="System Bold" size="15.0"/>
-                                            </font>
-                                        </Label>
-                                        <TableView fx:id="mapVersionTableView" prefHeight="200.0" prefWidth="200.0"
-                                                   VBox.vgrow="ALWAYS"/>
-                                    </children>
-                                </VBox>
-                            </children>
-                        </HBox>
-                    </items>
-                </SplitPane>
-            </content>
-        </Tab>
-        <Tab closable="false" disable="true" text="Mod vault">
-            <content>
-                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"/>
-            </content>
-        </Tab>
-        <Tab closable="false" text="Avatars">
-            <content>
-                <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="200.0" prefWidth="160.0">
-                    <items>
-                        <VBox>
-                            <children>
-                                <HBox>
-                                    <children>
-                                        <VBox>
-                                            <children>
-                                                <RadioButton fx:id="showAllAvatarsRadioButton" mnemonicParsing="false"
-                                                             selected="true" text="show all">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </VBox.margin>
-                                                    <toggleGroup>
-                                                        <ToggleGroup fx:id="avatarSearch"/>
-                                                    </toggleGroup>
-                                                </RadioButton>
-                                                <RadioButton fx:id="searchAvatarsByIdRadioButton"
-                                                             mnemonicParsing="false" text="search by id"
-                                                             toggleGroup="$avatarSearch">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </VBox.margin>
-                                                </RadioButton>
-                                                <RadioButton fx:id="searchAvatarsByTooltipRadioButton"
-                                                             mnemonicParsing="false" text="search by tooltip"
-                                                             toggleGroup="$avatarSearch">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </VBox.margin>
-                                                </RadioButton>
-                                                <RadioButton fx:id="searchAvatarsByAssignedUserRadioButton"
-                                                             mnemonicParsing="false" text="search by assigned user"
-                                                             toggleGroup="$avatarSearch">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </VBox.margin>
-                                                </RadioButton>
-                                                <TextField fx:id="searchAvatarsTextField">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </VBox.margin>
-                                                </TextField>
-                                                <Button mnemonicParsing="false" onAction="#onSearchAvatars"
-                                                        text="search avatars">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
-                                                    </VBox.margin>
-                                                </Button>
-                                                <Button mnemonicParsing="false" text="delete selected avatar">
-                                                    <VBox.margin>
-                                                        <Insets bottom="5.0" left="5.0" right="5.0" top="40.0"/>
-                                                    </VBox.margin>
-                                                </Button>
-                                            </children>
-                                            <HBox.margin>
-                                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                                            </HBox.margin>
-                                        </VBox>
-                                        <TableView fx:id="avatarTableView" HBox.hgrow="ALWAYS"/>
-                                    </children>
-                                </HBox>
-                                <HBox>
-                                    <children>
-                                        <TextField promptText="New avatar tooltip" HBox.hgrow="ALWAYS"/>
-                                        <Button mnemonicParsing="false" text="choose file &amp; add"/>
-                                    </children>
-                                    <VBox.margin>
-                                        <Insets top="10.0"/>
-                                    </VBox.margin>
-                                </HBox>
-                            </children>
-                        </VBox>
-                        <TabPane minHeight="200.0">
-                            <tabs>
-                                <Tab closable="false" text="Assignments">
-                                    <content>
-                                        <TableView fx:id="avatarAssignmentTableView" editable="true" prefHeight="200.0"
-                                                   prefWidth="200.0"/>
-                                    </content>
-                                </Tab>
-                            </tabs>
-                        </TabPane>
-                    </items>
-                </SplitPane>
-            </content>
-        </Tab>
-        <Tab closable="false" text="Recent activity">
-            <content>
-                <VBox alignment="TOP_CENTER">
-                    <children>
-                        <Button minWidth="200.0" mnemonicParsing="false" onAction="#refreshRecentActivity"
-                                text="refresh">
-                            <VBox.margin>
-                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
-                            </VBox.margin>
-                        </Button>
-                        <ScrollPane fitToWidth="true" maxHeight="1.7976931348623157E308"
-                                    maxWidth="1.7976931348623157E308">
-                            <content>
-                                <VBox>
-                                    <children>
-                                        <TitledPane expanded="false" text="Latest Registrations">
-                                            <content>
-                                                <TableView fx:id="userRegistrationFeedTableView"/>
-                                            </content>
-                                        </TitledPane>
-                                        <TitledPane expanded="false" text="Latest Teamkills">
-                                            <content>
-                                                <TableView fx:id="teamkillFeedTableView"/>
-                                            </content>
-                                        </TitledPane>
-                                    </children>
-                                </VBox>
-                            </content>
-                        </ScrollPane>
-                    </children>
-                </VBox>
-            </content>
-        </Tab>
+        <Tab fx:id="userManagementTab" closable="false" text="User Management"/>
+        <Tab fx:id="ladderMapPoolTab" closable="false" text="Ladder Map Pool"/>
+        <Tab fx:id="mapVaultTab" closable="false" text="Map vault"/>
+        <Tab fx:id="modVaultTab" closable="false" disable="true" text="Mod vault"/>
+        <Tab fx:id="avatarsTab" closable="false" text="Avatars"/>
+        <Tab fx:id="recentActivityTab" closable="false" text="Recent activity"/>
     </tabs>
 </TabPane>
diff --git a/src/main/resources/ui/main_window/avatars.fxml b/src/main/resources/ui/main_window/avatars.fxml
new file mode 100644
index 0000000..e4abf3a
--- /dev/null
+++ b/src/main/resources/ui/main_window/avatars.fxml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.5" orientation="VERTICAL"
+           xmlns="http://javafx.com/javafx/8.0.111"
+           fx:controller="com.faforever.moderatorclient.ui.main_window.AvatarsController">
+    <items>
+        <VBox>
+            <children>
+                <HBox>
+                    <children>
+                        <VBox>
+                            <children>
+                                <RadioButton fx:id="showAllAvatarsRadioButton" mnemonicParsing="false" selected="true"
+                                             text="show all">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                    <toggleGroup>
+                                        <ToggleGroup fx:id="avatarSearch"/>
+                                    </toggleGroup>
+                                </RadioButton>
+                                <RadioButton fx:id="searchAvatarsByIdRadioButton" mnemonicParsing="false"
+                                             text="search by id" toggleGroup="$avatarSearch">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                </RadioButton>
+                                <RadioButton fx:id="searchAvatarsByTooltipRadioButton" mnemonicParsing="false"
+                                             text="search by tooltip" toggleGroup="$avatarSearch">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                </RadioButton>
+                                <RadioButton fx:id="searchAvatarsByAssignedUserRadioButton" mnemonicParsing="false"
+                                             text="search by assigned user" toggleGroup="$avatarSearch">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                </RadioButton>
+                                <TextField fx:id="searchAvatarsTextField">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                </TextField>
+                                <Button mnemonicParsing="false" onAction="#onSearchAvatars" text="search avatars">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                </Button>
+                                <Button mnemonicParsing="false" text="delete selected avatar">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="40.0"/>
+                                    </VBox.margin>
+                                </Button>
+                            </children>
+                            <HBox.margin>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                            </HBox.margin>
+                        </VBox>
+                        <TableView fx:id="avatarTableView" HBox.hgrow="ALWAYS"/>
+                    </children>
+                </HBox>
+                <HBox>
+                    <children>
+                        <TextField promptText="New avatar tooltip" HBox.hgrow="ALWAYS"/>
+                        <Button mnemonicParsing="false" text="choose file &amp; add"/>
+                    </children>
+                    <VBox.margin>
+                        <Insets top="10.0"/>
+                    </VBox.margin>
+                </HBox>
+            </children>
+        </VBox>
+        <TabPane minHeight="200.0">
+            <tabs>
+                <Tab closable="false" text="Assignments">
+                    <content>
+                        <TableView fx:id="avatarAssignmentTableView" editable="true" prefHeight="200.0"
+                                   prefWidth="200.0"/>
+                    </content>
+                </Tab>
+            </tabs>
+        </TabPane>
+    </items>
+</SplitPane>
diff --git a/src/main/resources/ui/main_window/ladderMapPool.fxml b/src/main/resources/ui/main_window/ladderMapPool.fxml
new file mode 100644
index 0000000..4e855e9
--- /dev/null
+++ b/src/main/resources/ui/main_window/ladderMapPool.fxml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.5" orientation="VERTICAL"
+           xmlns="http://javafx.com/javafx/8.0.111"
+           fx:controller="com.faforever.moderatorclient.ui.main_window.LadderMapPoolController">
+    <items>
+        <VBox>
+            <children>
+                <Label text="Current ladder pool">
+                    <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                    </padding>
+                    <font>
+                        <Font name="System Bold" size="15.0"/>
+                    </font>
+                </Label>
+                <HBox prefWidth="700.0">
+                    <children>
+                        <TreeTableView fx:id="ladderPoolView" HBox.hgrow="ALWAYS"/>
+                        <ImageView fx:id="ladderPoolImageView" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true"
+                                   preserveRatio="true"/>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+                    <children>
+                        <Button fx:id="removeFromPoolButton" alignment="CENTER" disable="true" mnemonicParsing="false"
+                                onAction="#onRemoveFromLadderPool" text="remove selected map from pool"
+                                HBox.hgrow="ALWAYS">
+                            <HBox.margin>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                            </HBox.margin>
+                        </Button>
+                    </children>
+                </HBox>
+            </children>
+        </VBox>
+        <VBox>
+            <children>
+                <HBox>
+                    <children>
+                        <Label text="Map vault">
+                            <padding>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                            </padding>
+                            <font>
+                                <Font name="System Bold" size="15.0"/>
+                            </font>
+                        </Label>
+                        <Label text="(only ranked and not hidden maps)">
+                            <padding>
+                                <Insets bottom="10.0" right="10.0" top="10.0"/>
+                            </padding>
+                        </Label>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER_LEFT">
+                    <children>
+                        <CheckBox fx:id="filterByMapNameCheckBox" mnemonicParsing="false" text="filter by map name:">
+                            <padding>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </padding>
+                            <HBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </HBox.margin>
+                        </CheckBox>
+                        <TextField fx:id="mapNamePatternTextField">
+                            <padding>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </padding>
+                            <HBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </HBox.margin>
+                        </TextField>
+                        <Button mnemonicParsing="false" onAction="#onSearchMapVault" text="search vault">
+                            <padding>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </padding>
+                            <HBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </HBox.margin>
+                        </Button>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER_LEFT" prefWidth="200.0"/>
+                <HBox alignment="CENTER_LEFT" prefWidth="200.0"/>
+                <HBox>
+                    <children>
+                        <TreeTableView fx:id="mapVaultView" HBox.hgrow="ALWAYS"/>
+                        <ImageView fx:id="mapVaultImageView" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true"
+                                   preserveRatio="true"/>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER">
+                    <children>
+                        <Button fx:id="addToPoolButton" disable="true" mnemonicParsing="false"
+                                onAction="#onAddToLadderPool" text="add selected map to pool">
+                            <HBox.margin>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                            </HBox.margin>
+                        </Button>
+                    </children>
+                </HBox>
+            </children>
+        </VBox>
+    </items>
+</SplitPane>
diff --git a/src/main/resources/ui/main_window/mapVault.fxml b/src/main/resources/ui/main_window/mapVault.fxml
new file mode 100644
index 0000000..c42d9dc
--- /dev/null
+++ b/src/main/resources/ui/main_window/mapVault.fxml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.5" orientation="VERTICAL"
+           xmlns="http://javafx.com/javafx/8.0.111"
+           fx:controller="com.faforever.moderatorclient.ui.main_window.MapVaultController">
+    <items>
+        <TabPane tabClosingPolicy="UNAVAILABLE">
+            <tabs>
+                <Tab closable="false" text="Search">
+                    <content>
+                        <HBox prefHeight="100.0" prefWidth="200.0">
+                            <children>
+                                <VBox minWidth="220.0">
+                                    <children>
+                                        <RadioButton fx:id="searchMapByMapNameRadioButton" mnemonicParsing="false"
+                                                     selected="true" text="search by name">
+                                            <VBox.margin>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                            <toggleGroup>
+                                                <ToggleGroup fx:id="mapSearch"/>
+                                            </toggleGroup>
+                                        </RadioButton>
+                                        <RadioButton fx:id="searchMapByAuthorIdRadioButton" mnemonicParsing="false"
+                                                     text="search by author id" toggleGroup="$mapSearch">
+                                            <padding>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </padding>
+                                        </RadioButton>
+                                        <RadioButton fx:id="searchMapByAuthorNameRadioButton" mnemonicParsing="false"
+                                                     text="search by author name" toggleGroup="$mapSearch">
+                                            <padding>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </padding>
+                                        </RadioButton>
+                                        <TextField fx:id="mapSearchTextField">
+                                            <VBox.margin>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                        </TextField>
+                                        <CheckBox fx:id="excludeHiddenMapVersionsCheckbox" mnemonicParsing="false"
+                                                  selected="true" text="no hidden map versions">
+                                            <VBox.margin>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                        </CheckBox>
+                                        <Button mnemonicParsing="false" onAction="#onSearchMaps" text="search map">
+                                            <VBox.margin>
+                                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                            </VBox.margin>
+                                        </Button>
+                                    </children>
+                                    <HBox.margin>
+                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                                    </HBox.margin>
+                                </VBox>
+                                <VBox HBox.hgrow="ALWAYS">
+                                    <children>
+                                        <Label alignment="CENTER" maxHeight="1.7976931348623157E308"
+                                               maxWidth="1.7976931348623157E308" style="-fx-background-color: #ccc;"
+                                               text="Maps">
+                                            <padding>
+                                                <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
+                                            </padding>
+                                            <font>
+                                                <Font name="System Bold" size="15.0"/>
+                                            </font>
+                                        </Label>
+                                        <TableView fx:id="mapSearchTableView" VBox.vgrow="ALWAYS"/>
+                                    </children>
+                                </VBox>
+                            </children>
+                        </HBox>
+                    </content>
+                </Tab>
+            </tabs>
+        </TabPane>
+        <HBox>
+            <children>
+                <VBox alignment="CENTER" minWidth="220.0">
+                    <HBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                    </HBox.margin>
+                    <children>
+                        <ImageView fx:id="mapVersionPreviewImageView" fitHeight="150.0" fitWidth="200.0"
+                                   pickOnBounds="true" preserveRatio="true">
+                            <VBox.margin>
+                                <Insets bottom="25.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </ImageView>
+                        <Button fx:id="toggleMapVersionRatingButton" disable="true" mnemonicParsing="false"
+                                onAction="#onToggleMapVersionRanking" text="rank / unrank">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </Button>
+                        <Button fx:id="toggleMapVersionHidingButton" disable="true" mnemonicParsing="false"
+                                onAction="#onToggleMapVersionHiding" text="hide / unhide">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </Button>
+                    </children>
+                </VBox>
+                <VBox HBox.hgrow="ALWAYS">
+                    <children>
+                        <Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+                               style="-fx-background-color: #ccc;" text="Map Versions">
+                            <VBox.margin>
+                                <Insets/>
+                            </VBox.margin>
+                            <padding>
+                                <Insets bottom="2.0" left="2.0" right="2.0" top="2.0"/>
+                            </padding>
+                            <font>
+                                <Font name="System Bold" size="15.0"/>
+                            </font>
+                        </Label>
+                        <TableView fx:id="mapVersionTableView" VBox.vgrow="ALWAYS"/>
+                    </children>
+                </VBox>
+            </children>
+        </HBox>
+    </items>
+</SplitPane>
diff --git a/src/main/resources/ui/main_window/recentActivity.fxml b/src/main/resources/ui/main_window/recentActivity.fxml
new file mode 100644
index 0000000..41fa8b5
--- /dev/null
+++ b/src/main/resources/ui/main_window/recentActivity.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" alignment="TOP_CENTER" xmlns="http://javafx.com/javafx/8.0.111"
+      fx:controller="com.faforever.moderatorclient.ui.main_window.RecentActivityController">
+    <children>
+        <Button minWidth="200.0" mnemonicParsing="false" onAction="#refresh" text="refresh">
+            <VBox.margin>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            </VBox.margin>
+        </Button>
+        <ScrollPane fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+            <content>
+                <VBox>
+                    <children>
+                        <TitledPane expanded="false" text="Latest Registrations">
+                            <content>
+                                <TableView fx:id="userRegistrationFeedTableView"/>
+                            </content>
+                        </TitledPane>
+                        <TitledPane expanded="false" text="Latest Teamkills">
+                            <content>
+                                <TableView fx:id="teamkillFeedTableView"/>
+                            </content>
+                        </TitledPane>
+                    </children>
+                </VBox>
+            </content>
+        </ScrollPane>
+    </children>
+</VBox>
diff --git a/src/main/resources/ui/main_window/userManagement.fxml b/src/main/resources/ui/main_window/userManagement.fxml
new file mode 100644
index 0000000..716b9a9
--- /dev/null
+++ b/src/main/resources/ui/main_window/userManagement.fxml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.5" orientation="VERTICAL"
+           prefHeight="200.0" prefWidth="160.0" xmlns="http://javafx.com/javafx/8.0.111"
+           fx:controller="com.faforever.moderatorclient.ui.main_window.UserManagementController">
+    <items>
+        <HBox>
+            <children>
+                <VBox minWidth="220.0">
+                    <children>
+                        <RadioButton fx:id="searchUserByCurrentNameRadioButton" mnemonicParsing="false" selected="true"
+                                     text="search by current name">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                            <toggleGroup>
+                                <ToggleGroup fx:id="userSearch"/>
+                            </toggleGroup>
+                        </RadioButton>
+                        <RadioButton fx:id="searchUserByPreviousNamesRadioButton" mnemonicParsing="false"
+                                     text="search by previous names" toggleGroup="$userSearch">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </RadioButton>
+                        <RadioButton fx:id="searchUserByIdRadioButton" mnemonicParsing="false" text="search by id"
+                                     toggleGroup="$userSearch">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </RadioButton>
+                        <RadioButton fx:id="searchUserByEmailRadioButton" mnemonicParsing="false" text="search by email"
+                                     toggleGroup="$userSearch">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </RadioButton>
+                        <RadioButton fx:id="searchUserBySteamIdRadioButton" mnemonicParsing="false"
+                                     text="search by Steam ID" toggleGroup="$userSearch">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </RadioButton>
+                        <RadioButton fx:id="searchUserByIpRadioButton" mnemonicParsing="false"
+                                     text="search by IP address" toggleGroup="$userSearch">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </RadioButton>
+                        <TextField fx:id="userSearchTextField">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </TextField>
+                        <Button mnemonicParsing="false" onAction="#onUserSearch" text="search user">
+                            <VBox.margin>
+                                <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                            </VBox.margin>
+                        </Button>
+                    </children>
+                    <HBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+                    </HBox.margin>
+                </VBox>
+                <TableView fx:id="userSearchTableView" maxHeight="1.7976931348623157E308"
+                           maxWidth="1.7976931348623157E308" minWidth="550.0" prefHeight="200.0" HBox.hgrow="ALWAYS"/>
+            </children>
+        </HBox>
+        <TabPane minHeight="200.0" tabClosingPolicy="UNAVAILABLE">
+            <tabs>
+                <Tab text="Bans">
+                    <content>
+                        <VBox>
+                            <children>
+                                <TableView fx:id="userBansTableView" prefHeight="200.0" prefWidth="200.0"
+                                           VBox.vgrow="ALWAYS">
+                                    <VBox.margin>
+                                        <Insets bottom="10.0"/>
+                                    </VBox.margin>
+                                </TableView>
+                                <HBox alignment="CENTER">
+                                    <children>
+                                        <Button fx:id="newBanButton" disable="true" mnemonicParsing="false"
+                                                onAction="#onNewBan" text="Apply new ban">
+                                            <HBox.margin>
+                                                <Insets/>
+                                            </HBox.margin>
+                                        </Button>
+                                        <Button fx:id="editBanButton" disable="true" mnemonicParsing="false"
+                                                onAction="#onEditBan" text="Edit selected ban">
+                                            <HBox.margin>
+                                                <Insets left="10.0"/>
+                                            </HBox.margin>
+                                        </Button>
+                                    </children>
+                                    <VBox.margin>
+                                        <Insets/>
+                                    </VBox.margin>
+                                    <padding>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </padding>
+                                </HBox>
+                            </children>
+                        </VBox>
+                    </content>
+                </Tab>
+                <Tab text="Teamkills">
+                    <content>
+                        <TableView fx:id="userTeamkillsTableView" prefHeight="200.0" prefWidth="200.0"/>
+                    </content>
+                </Tab>
+                <Tab text="Name History">
+                    <content>
+                        <TableView fx:id="userNameHistoryTableView" maxHeight="1.7976931348623157E308"
+                                   maxWidth="1.7976931348623157E308" prefHeight="200.0"/>
+                    </content>
+                </Tab>
+                <Tab text="Last Games">
+                    <content>
+                        <VBox>
+                            <children>
+                                <HBox spacing="10">
+                                    <VBox.margin>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </VBox.margin>
+                                    <children>
+                                        <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+                                               text="Show featured Mods:"/>
+                                        <ChoiceBox fx:id="featuredModFilterChoiceBox" minWidth="150.0"/>
+                                        <Button fx:id="loadMoreGamesButton" onAction="#loadMoreGames" text="Load more"/>
+                                    </children>
+                                </HBox>
+                                <TableView fx:id="userLastGamesTable" maxHeight="1.7976931348623157E308"
+                                           maxWidth="1.7976931348623157E308" VBox.vgrow="ALWAYS"/>
+                            </children>
+                        </VBox>
+                    </content>
+                </Tab>
+                <Tab text="Avatars">
+                    <content>
+                        <TableView fx:id="userAvatarsTableView" prefHeight="200.0" prefWidth="200.0"/>
+                    </content>
+                </Tab>
+            </tabs>
+        </TabPane>
+    </items>
+</SplitPane>

From c6a54381b9d76e05f68f7598d5ed04d6376af1eb Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Tue, 5 Dec 2017 23:17:35 +0100
Subject: [PATCH 10/14] fixes #15 Add domain blacklist management tab

---
 .../api/dto/DomainBlacklist.java              | 17 ++++
 .../rest/domain/DomainBlacklistService.java   | 37 ++++++++
 .../mapstruct/DomainBlacklistMapper.java      | 16 ++++
 .../moderatorclient/ui/MainController.java    | 11 ++-
 .../ui/domain/DomainBlacklistFX.java          | 24 +++++
 .../DomainBlacklistController.java            | 88 +++++++++++++++++++
 src/main/resources/ui/mainWindow.fxml         |  1 +
 7 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/api/dto/DomainBlacklist.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/api/rest/domain/DomainBlacklistService.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/DomainBlacklistMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/DomainBlacklistFX.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/main_window/DomainBlacklistController.java

diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/DomainBlacklist.java b/src/main/java/com/faforever/moderatorclient/api/dto/DomainBlacklist.java
new file mode 100644
index 0000000..ac21d4e
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/DomainBlacklist.java
@@ -0,0 +1,17 @@
+package com.faforever.moderatorclient.api.dto;
+
+import com.github.jasminb.jsonapi.annotations.Id;
+import com.github.jasminb.jsonapi.annotations.Type;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@RestrictedVisibility("IsModerator")
+@Getter
+@Setter
+@EqualsAndHashCode(of = "domain")
+@Type("domainBlacklist")
+public class DomainBlacklist {
+    @Id
+    String domain;
+}
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/DomainBlacklistService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/DomainBlacklistService.java
new file mode 100644
index 0000000..05ac6a0
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/DomainBlacklistService.java
@@ -0,0 +1,37 @@
+package com.faforever.moderatorclient.api.rest.domain;
+
+import com.faforever.moderatorclient.api.dto.DomainBlacklist;
+import com.faforever.moderatorclient.api.rest.ElideRouteBuilder;
+import com.faforever.moderatorclient.api.rest.FafApiCommunicationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class DomainBlacklistService {
+    private final FafApiCommunicationService fafApi;
+
+    public DomainBlacklistService(FafApiCommunicationService fafApi) {
+        this.fafApi = fafApi;
+    }
+
+    public List<DomainBlacklist> getAll() {
+        log.debug("Retrieving all domainBlacklists");
+        List<DomainBlacklist> result = fafApi.getAll(ElideRouteBuilder.of(DomainBlacklist.class));
+        log.trace("found {} avatars", result.size());
+        return result;
+    }
+
+    public void remove(String domain) {
+        log.debug("Deleting domainBlacklist: {}", domain);
+        fafApi.delete(ElideRouteBuilder.of(DomainBlacklist.class).id(domain));
+    }
+
+    public void add(DomainBlacklist domainBlacklist) {
+        log.debug("Adding domainBlacklist: {}", domainBlacklist.getDomain());
+        fafApi.post(ElideRouteBuilder.of(DomainBlacklist.class), domainBlacklist);
+    }
+
+}
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/DomainBlacklistMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/DomainBlacklistMapper.java
new file mode 100644
index 0000000..2047aa4
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/DomainBlacklistMapper.java
@@ -0,0 +1,16 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.DomainBlacklist;
+import com.faforever.moderatorclient.ui.domain.DomainBlacklistFX;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(uses = JavaFXMapper.class)
+public interface DomainBlacklistMapper {
+    DomainBlacklistFX map(DomainBlacklist domainBlacklist);
+
+    DomainBlacklist map(DomainBlacklistFX domainBlacklistFX);
+
+    List<DomainBlacklistFX> map(List<DomainBlacklist> domainBlacklistList);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/MainController.java b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
index e473483..49a83c8 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/MainController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/MainController.java
@@ -18,17 +18,19 @@ public class MainController implements Controller<TabPane> {
     public Tab mapVaultTab;
     public Tab modVaultTab;
     public Tab avatarsTab;
+    public Tab recentActivityTab;
+    public Tab domainBlacklistTab;
 
 
     private final UiService uiService;
 
     public TabPane root;
-    public Tab recentActivityTab;
     private UserManagementController userManagementController;
     private LadderMapPoolController ladderMapPoolController;
     private MapVaultController mapVaultController;
     private AvatarsController avatarsController;
     private RecentActivityController recentActivityController;
+    private DomainBlacklistController domainBlacklistController;
 
     public MainController(UiService uiService) {
         this.uiService = uiService;
@@ -46,6 +48,7 @@ public void initialize() {
         initMapVaultTab();
         initAvatarTab();
         initRecentActivityTab();
+        initDomainBlacklistTab();
     }
 
     private void initUserManagementTab() {
@@ -73,6 +76,11 @@ private void initRecentActivityTab() {
         recentActivityTab.setContent(recentActivityController.getRoot());
     }
 
+    private void initDomainBlacklistTab() {
+        domainBlacklistController = uiService.loadFxml("ui/main_window/domainBlacklist.fxml");
+        domainBlacklistTab.setContent(domainBlacklistController.getRoot());
+    }
+
     public void display() {
         LoginController loginController = uiService.loadFxml("ui/login.fxml");
 
@@ -87,6 +95,7 @@ public void display() {
         ladderMapPoolController.refresh();
         refreshAvatars();
         refreshRecentActivity();
+        domainBlacklistController.refresh();
     }
 
 
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/DomainBlacklistFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/DomainBlacklistFX.java
new file mode 100644
index 0000000..c570fae
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/DomainBlacklistFX.java
@@ -0,0 +1,24 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class DomainBlacklistFX {
+    private final StringProperty domain;
+
+    public DomainBlacklistFX() {
+        domain = new SimpleStringProperty();
+    }
+
+    public String getDomain() {
+        return domain.get();
+    }
+
+    public void setDomain(String domain) {
+        this.domain.set(domain);
+    }
+
+    public StringProperty domainProperty() {
+        return domain;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/DomainBlacklistController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/DomainBlacklistController.java
new file mode 100644
index 0000000..1268076
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/DomainBlacklistController.java
@@ -0,0 +1,88 @@
+package com.faforever.moderatorclient.ui.main_window;
+
+import com.faforever.moderatorclient.api.dto.DomainBlacklist;
+import com.faforever.moderatorclient.api.rest.domain.DomainBlacklistService;
+import com.faforever.moderatorclient.mapstruct.DomainBlacklistMapper;
+import com.faforever.moderatorclient.ui.Controller;
+import com.faforever.moderatorclient.ui.domain.DomainBlacklistFX;
+import com.google.common.collect.Lists;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.util.Callback;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class DomainBlacklistController implements Controller<SplitPane> {
+    private final DomainBlacklistService domainBlacklistService;
+    private final DomainBlacklistMapper domainBlacklistMapper;
+
+    public SplitPane root;
+    public ListView<DomainBlacklistFX> currentDomainBlacklistListView;
+    public TextArea addDomainBlacklistTextArea;
+
+    public DomainBlacklistController(DomainBlacklistService domainBlacklistService, DomainBlacklistMapper domainBlacklistMapper) {
+        this.domainBlacklistService = domainBlacklistService;
+        this.domainBlacklistMapper = domainBlacklistMapper;
+    }
+
+    @FXML
+    public void initialize() {
+        currentDomainBlacklistListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        currentDomainBlacklistListView.setCellFactory(new Callback<ListView<DomainBlacklistFX>, ListCell<DomainBlacklistFX>>() {
+            @Override
+            public ListCell<DomainBlacklistFX> call(ListView<DomainBlacklistFX> lv) {
+                return new ListCell<DomainBlacklistFX>() {
+                    @Override
+                    public void updateItem(DomainBlacklistFX item, boolean empty) {
+                        super.updateItem(item, empty);
+
+                        textProperty().unbind();
+                        if (item == null) {
+                            setText(null);
+                        } else {
+                            textProperty().bind(item.domainProperty());
+                        }
+                    }
+                };
+            }
+        });
+    }
+
+    @Override
+    public SplitPane getRoot() {
+        return root;
+    }
+
+    public void refresh() {
+        currentDomainBlacklistListView.getItems().clear();
+        currentDomainBlacklistListView.getItems().addAll(
+                domainBlacklistMapper.map(domainBlacklistService.getAll())
+        );
+    }
+
+    public void removeSelected() {
+        for (DomainBlacklistFX selected : currentDomainBlacklistListView.getSelectionModel().getSelectedItems()) {
+            domainBlacklistService.remove(selected.getDomain());
+        }
+
+        refresh();
+    }
+
+    public void addList() {
+        List<String> newDomains = Lists.newArrayList(addDomainBlacklistTextArea.getText().split("\\n"));
+        List<String> currentDomains = currentDomainBlacklistListView.getItems().stream()
+                .map(DomainBlacklistFX::getDomain)
+                .collect(Collectors.toList());
+
+        newDomains.stream()
+                .filter(newDomain -> !currentDomains.contains(newDomain))
+                .forEach(newDomain -> domainBlacklistService.add(new DomainBlacklist().setDomain(newDomain)));
+
+        refresh();
+    }
+}
diff --git a/src/main/resources/ui/mainWindow.fxml b/src/main/resources/ui/mainWindow.fxml
index 52fb317..83931e9 100644
--- a/src/main/resources/ui/mainWindow.fxml
+++ b/src/main/resources/ui/mainWindow.fxml
@@ -12,5 +12,6 @@
         <Tab fx:id="modVaultTab" closable="false" disable="true" text="Mod vault"/>
         <Tab fx:id="avatarsTab" closable="false" text="Avatars"/>
         <Tab fx:id="recentActivityTab" closable="false" text="Recent activity"/>
+        <Tab fx:id="domainBlacklistTab" text="Domain Blacklist"/>
     </tabs>
 </TabPane>

From 4a7fbd169e5414b1cd4713679622dead20934431 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Thu, 7 Dec 2017 22:44:32 +0100
Subject: [PATCH 11/14] fixes #15 missing fxml

---
 .../ui/main_window/domainBlacklist.fxml       | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/main/resources/ui/main_window/domainBlacklist.fxml

diff --git a/src/main/resources/ui/main_window/domainBlacklist.fxml b/src/main/resources/ui/main_window/domainBlacklist.fxml
new file mode 100644
index 0000000..4eb5ae3
--- /dev/null
+++ b/src/main/resources/ui/main_window/domainBlacklist.fxml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.5" maxHeight="1.7976931348623157E308"
+           maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
+           xmlns="http://javafx.com/javafx/8.0.111"
+           fx:controller="com.faforever.moderatorclient.ui.main_window.DomainBlacklistController">
+    <items>
+        <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+            <children>
+                <ListView fx:id="currentDomainBlacklistListView" maxHeight="1.7976931348623157E308"
+                          maxWidth="1.7976931348623157E308" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets/>
+                    </VBox.margin>
+                </ListView>
+                <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#removeSelected"
+                        text="remove selected">
+                    <VBox.margin>
+                        <Insets top="10.0"/>
+                    </VBox.margin>
+                </Button>
+            </children>
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            </padding>
+        </VBox>
+        <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+            <children>
+                <TextArea fx:id="addDomainBlacklistTextArea" maxHeight="1.7976931348623157E308"
+                          maxWidth="1.7976931348623157E308" minWidth="300.0" VBox.vgrow="ALWAYS"/>
+                <Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#addList" text="add list">
+                    <VBox.margin>
+                        <Insets top="10.0"/>
+                    </VBox.margin>
+                </Button>
+            </children>
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            </padding>
+        </VBox>
+    </items>
+</SplitPane>

From 914696fb70a822a089468a75eb8fd2e48675c701 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Thu, 7 Dec 2017 00:24:17 +0100
Subject: [PATCH 12/14] fixes #16 Notes per user

---
 .../moderatorclient/api/dto/UserNote.java     |  19 +++
 .../api/rest/domain/UserService.java          |  35 +++-
 .../mapstruct/UserNoteMapper.java             |  16 ++
 .../moderatorclient/ui/BanInfoController.java |   2 +-
 .../moderatorclient/ui/TextAreaTableCell.java | 159 ++++++++++++++++++
 .../ui/UserNoteController.java                | 125 ++++++++++++++
 .../moderatorclient/ui/ViewHelper.java        |  64 ++++++-
 .../moderatorclient/ui/domain/PlayerFX.java   |   9 +
 .../moderatorclient/ui/domain/UserNoteFX.java |  68 ++++++++
 .../main_window/UserManagementController.java |  54 +++++-
 .../ui/main_window/userManagement.fxml        |  31 +++-
 src/main/resources/ui/userNote.fxml           |  58 +++++++
 12 files changed, 631 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/mapstruct/UserNoteMapper.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java
 create mode 100644 src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java
 create mode 100644 src/main/resources/ui/userNote.fxml

diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java b/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java
new file mode 100644
index 0000000..b9375ea
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java
@@ -0,0 +1,19 @@
+package com.faforever.moderatorclient.api.dto;
+
+import com.github.jasminb.jsonapi.annotations.Relationship;
+import com.github.jasminb.jsonapi.annotations.Type;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Type("userNote")
+@RestrictedVisibility("IsModerator")
+public class UserNote extends AbstractEntity {
+    @Relationship("user")
+    private Player user;
+    @Relationship("author")
+    private Player author;
+    private boolean watched;
+    private String note;
+}
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
index 7511f93..fa900ed 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
@@ -5,7 +5,9 @@
 import com.faforever.moderatorclient.api.rest.FafApiCommunicationService;
 import com.faforever.moderatorclient.mapstruct.FeaturedModMapper;
 import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
+import com.faforever.moderatorclient.mapstruct.UserNoteMapper;
 import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
+import com.faforever.moderatorclient.ui.domain.UserNoteFX;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -21,12 +23,14 @@ public class UserService {
     private final FafApiCommunicationService fafApi;
     private final GamePlayerStatsMapper gamePlayerStatsMapper;
     private final FeaturedModMapper featuredModMapper;
+    private final UserNoteMapper userNoteMapper;
 
 
-    public UserService(FafApiCommunicationService fafApi, GamePlayerStatsMapper gamePlayerStatsMapper, FeaturedModMapper featuredModMapper) {
+    public UserService(FafApiCommunicationService fafApi, GamePlayerStatsMapper gamePlayerStatsMapper, FeaturedModMapper featuredModMapper, UserNoteMapper userNoteMapper) {
         this.fafApi = fafApi;
         this.gamePlayerStatsMapper = gamePlayerStatsMapper;
         this.featuredModMapper = featuredModMapper;
+        this.userNoteMapper = userNoteMapper;
     }
 
     private ElideRouteBuilder addModeratorIncludes(@NotNull ElideRouteBuilder builder) {
@@ -180,4 +184,33 @@ public List<FeaturedModFX> getFeaturedMods() {
         ElideRouteBuilder<FeaturedMod> routeBuilder = ElideRouteBuilder.of(FeaturedMod.class);
         return featuredModMapper.map(fafApi.getAll(routeBuilder));
     }
+
+    public UserNoteFX getUserNoteById(@NotNull String userNoteId) {
+        log.debug("Search for user note id: " + userNoteId);
+        ElideRouteBuilder<UserNote> routeBuilder = ElideRouteBuilder.of(UserNote.class)
+                .id(userNoteId)
+                .addInclude("user")
+                .addInclude("author");
+        return userNoteMapper.map(fafApi.getOne(routeBuilder));
+    }
+
+    public List<UserNoteFX> getUserNotes(@NotNull String userId) {
+        log.debug("Search for all note of user id: " + userId);
+        ElideRouteBuilder<UserNote> routeBuilder = ElideRouteBuilder.of(UserNote.class)
+                .filter(ElideRouteBuilder.qBuilder().string("user.id").eq(userId))
+                .addInclude("user")
+                .addInclude("author");
+        return userNoteMapper.map(fafApi.getAll(routeBuilder));
+    }
+
+    public String createUserNote(UserNote userNote) {
+        log.debug("Creating userNote");
+        userNote.setAuthor(fafApi.getSelfPlayer());
+        return fafApi.post(ElideRouteBuilder.of(UserNote.class), userNote).getId();
+    }
+
+    public UserNoteFX patchUserNote(UserNote userNote) {
+        log.debug("Patching UserNote of id: ", userNote.getId());
+        return userNoteMapper.map(fafApi.patch(ElideRouteBuilder.of(UserNote.class).id(userNote.getId()), userNote));
+    }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/mapstruct/UserNoteMapper.java b/src/main/java/com/faforever/moderatorclient/mapstruct/UserNoteMapper.java
new file mode 100644
index 0000000..934b5cb
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/mapstruct/UserNoteMapper.java
@@ -0,0 +1,16 @@
+package com.faforever.moderatorclient.mapstruct;
+
+import com.faforever.moderatorclient.api.dto.UserNote;
+import com.faforever.moderatorclient.ui.domain.UserNoteFX;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(uses = {JavaFXMapper.class, PlayerMapper.class})
+public interface UserNoteMapper {
+    UserNoteFX map(UserNote userNote);
+
+    UserNote map(UserNoteFX userNoteFX);
+
+    List<UserNoteFX> map(List<UserNote> userNoteList);
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java b/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java
index 5cc8874..902a97a 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java
@@ -110,7 +110,7 @@ public void onSave() {
             log.debug("Creating ban for user '{}' with reason: {}", banInfo.getPlayer().toString(), banReasonTextField.getText());
             userService.createBan(banInfo);
         } else {
-            log.debug("Updateing ban id '{}'", banInfo.getId());
+            log.debug("Updating ban id '{}'", banInfo.getId());
             userService.patchBanInfo(banInfo);
         }
         close();
diff --git a/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java b/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java
new file mode 100644
index 0000000..3d76876
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java
@@ -0,0 +1,159 @@
+package com.faforever.moderatorclient.ui;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
+import javafx.util.converter.DefaultStringConverter;
+
+/**
+ * Originally created by eckig: https://gist.github.com/eckig/30abf0d7d51b7756c2e7
+ * <p>
+ * Creates a TableCell that contains a TextArea similar to a TextFieldTableCell.
+ *
+ * @param <S>
+ * @param <T>
+ */
+@SuppressWarnings("WeakerAccess")
+public class TextAreaTableCell<S, T> extends TableCell<S, T> {
+
+    private TextArea textArea;
+    private ObjectProperty<StringConverter<T>> converter = new SimpleObjectProperty<>(this, "converter");
+
+    public TextAreaTableCell() {
+        this(null);
+    }
+
+    public TextAreaTableCell(StringConverter<T> converter) {
+        this.getStyleClass().add("text-area-table-cell");
+        setConverter(converter);
+    }
+
+    public static <S> Callback<TableColumn<S, String>, TableCell<S, String>> forTableColumn() {
+        return forTableColumn(new DefaultStringConverter());
+    }
+
+    public static <S, T> Callback<TableColumn<S, T>, TableCell<S, T>> forTableColumn(final StringConverter<T> converter) {
+        return list -> new TextAreaTableCell<>(converter);
+    }
+
+    private static <T> String getItemText(Cell<T> cell, StringConverter<T> converter) {
+        return converter == null ? cell.getItem() == null ? "" : cell.getItem()
+                .toString() : converter.toString(cell.getItem());
+    }
+
+    private static <T> TextArea createTextArea(final Cell<T> cell, final StringConverter<T> converter) {
+        TextArea textArea = new TextArea(getItemText(cell, converter));
+        textArea.setWrapText(true);
+        textArea.editableProperty().bind(cell.editableProperty());
+
+        textArea.setOnKeyPressed(t -> {
+            if (t.getCode() == KeyCode.ESCAPE) {
+                cell.cancelEdit();
+                t.consume();
+            } else if (t.getCode() == KeyCode.ENTER && t.isShiftDown()) {
+                t.consume();
+                textArea.insertText(textArea.getCaretPosition(), "\n");
+            } else if (t.getCode() == KeyCode.ENTER) {
+                if (converter == null) {
+                    throw new IllegalStateException(
+                            "Attempting to convert text input into Object, but provided "
+                                    + "StringConverter is null. Be sure to set a StringConverter "
+                                    + "in your cell factory.");
+                }
+                cell.commitEdit(converter.fromString(textArea.getText()));
+                t.consume();
+            }
+        });
+        textArea.prefRowCountProperty().bind(Bindings.size(textArea.getParagraphs()));
+        return textArea;
+    }
+
+    private static <T> void cancelEdit(Cell<T> cell, final StringConverter<T> converter) {
+        cell.setText(getItemText(cell, converter));
+        cell.setGraphic(null);
+    }
+
+    private void startEdit(final Cell<T> cell, final StringConverter<T> converter) {
+        textArea.setText(getItemText(cell, converter));
+
+        cell.setText(null);
+        cell.setGraphic(textArea);
+
+        textArea.selectAll();
+        textArea.requestFocus();
+    }
+
+    private void updateItem(final Cell<T> cell, final StringConverter<T> converter) {
+
+        if (cell.isEmpty()) {
+            cell.setText(null);
+            cell.setGraphic(null);
+            cell.setTooltip(null);
+
+        } else {
+            if (cell.isEditing()) {
+                if (textArea != null) {
+                    textArea.setText(getItemText(cell, converter));
+                }
+                cell.setText(null);
+                cell.setGraphic(textArea);
+                cell.setTooltip(null);
+            } else {
+                cell.setText(getItemText(cell, converter));
+                cell.setGraphic(null);
+
+                //Add text as tooltip so that user can read text without editing it.
+                Tooltip tooltip = new Tooltip(getItemText(cell, converter));
+                tooltip.setWrapText(true);
+                tooltip.prefWidthProperty().bind(cell.widthProperty());
+                cell.setTooltip(tooltip);
+            }
+        }
+    }
+
+    public final ObjectProperty<StringConverter<T>> converterProperty() {
+        return converter;
+    }
+
+    public final StringConverter<T> getConverter() {
+        return converterProperty().get();
+    }
+
+    public final void setConverter(StringConverter<T> value) {
+        converterProperty().set(value);
+    }
+
+    @Override
+    public void startEdit() {
+        if (!isEditable() || !getTableView().isEditable() || !getTableColumn().isEditable()) {
+            return;
+        }
+
+        super.startEdit();
+
+        if (isEditing()) {
+            if (textArea == null) {
+                textArea = createTextArea(this, getConverter());
+            }
+
+            startEdit(this, getConverter());
+        }
+    }
+
+    @Override
+    public void cancelEdit() {
+        super.cancelEdit();
+        cancelEdit(this, getConverter());
+    }
+
+    @Override
+    public void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+        updateItem(this, getConverter());
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java b/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java
new file mode 100644
index 0000000..bf4020a
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java
@@ -0,0 +1,125 @@
+package com.faforever.moderatorclient.ui;
+
+import com.faforever.moderatorclient.api.rest.domain.UserService;
+import com.faforever.moderatorclient.mapstruct.UserNoteMapper;
+import com.faforever.moderatorclient.ui.domain.UserNoteFX;
+import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+
+@Component
+@Scope("prototype")
+@Slf4j
+public class UserNoteController implements Controller<Pane> {
+    private final UserService userService;
+    private final UserNoteMapper userNoteMapper;
+    public GridPane root;
+    public TextField affectedUserTextField;
+    public TextField authorTextField;
+    public TextArea noteTextArea;
+    public CheckBox watchedCheckBox;
+    @Getter
+    private UserNoteFX userNoteFX;
+    private Consumer<UserNoteFX> postedListener;
+
+    public UserNoteController(UserService userService, UserNoteMapper userNoteMapper) {
+        this.userService = userService;
+        this.userNoteMapper = userNoteMapper;
+    }
+
+    public void addPostedListener(Consumer<UserNoteFX> listener) {
+        this.postedListener = listener;
+    }
+
+    @Override
+    public Pane getRoot() {
+        return root;
+    }
+
+    @FXML
+    public void initialize() {
+    }
+
+    public void setUserNoteFX(UserNoteFX userNoteFX) {
+        this.userNoteFX = userNoteFX;
+
+        if (userNoteFX != null) {
+            Optional.ofNullable(userNoteFX.getUser()).ifPresent(author -> affectedUserTextField.textProperty().bind(author.representationProperty()));
+            Optional.ofNullable(userNoteFX.getAuthor()).ifPresent(author -> authorTextField.textProperty().bind(author.representationProperty()));
+            watchedCheckBox.setSelected(userNoteFX.isWatched());
+
+            noteTextArea.setText(userNoteFX.getNote());
+        }
+    }
+
+    public void onSave() {
+        Assert.notNull(userNoteFX, "You can't save if userNoteFX is null.");
+
+        if (!validate()) {
+            return;
+        }
+
+        userNoteFX.setNote(noteTextArea.getText());
+        userNoteFX.setWatched(watchedCheckBox.isSelected());
+
+        if (userNoteFX.getId() == null) {
+            log.debug("Creating userNote for user '{}'", userNoteFX.getUser().representationProperty().get());
+            String newNoteId = userService.createUserNote(userNoteMapper.map(userNoteFX));
+            UserNoteFX loadedUserNote = userService.getUserNoteById(newNoteId);
+            postedListener.accept(loadedUserNote);
+        } else {
+            log.debug("Updating userNote id '{}'", userNoteFX.getId());
+            userService.patchUserNote(userNoteMapper.map(userNoteFX));
+        }
+        close();
+    }
+
+    private boolean validate() {
+        List<String> validationErrors = new ArrayList<>();
+
+        if (StringUtils.isBlank(noteTextArea.getText())) {
+            validationErrors.add("No text is given.");
+        }
+
+        if (validationErrors.size() > 0) {
+            Alert errorAlert = new Alert(Alert.AlertType.ERROR);
+            errorAlert.setTitle("UserNote validation failed");
+            errorAlert.setContentText(
+                    validationErrors.stream()
+                            .collect(Collectors.joining("\n"))
+            );
+            errorAlert.showAndWait();
+
+            return false;
+        }
+
+        return true;
+    }
+
+    public void onAbort() {
+        close();
+    }
+
+    private void close() {
+        Stage stage = (Stage) root.getScene().getWindow();
+        stage.close();
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index 786eb55..314ea5e 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -1,12 +1,11 @@
 package com.faforever.moderatorclient.ui;
 
 import com.faforever.moderatorclient.api.dto.*;
-import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
-import com.faforever.moderatorclient.ui.domain.MapFX;
-import com.faforever.moderatorclient.ui.domain.MapVersionFX;
-import com.faforever.moderatorclient.ui.domain.PlayerFX;
+import com.faforever.moderatorclient.ui.domain.*;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.ObservableList;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
@@ -599,4 +598,61 @@ public static void fillMapTreeView(TreeTableView<MapTableItemAdapter> mapTreeVie
             map.getVersions().forEach(mapVersion -> mapItem.getChildren().add(new TreeItem<>(new MapTableItemAdapter(mapVersion))));
         });
     }
+
+    public static void buildNotesTableView(TableView<UserNoteFX> tableView, ObservableList<UserNoteFX> data, boolean includeUserId) {
+        tableView.setItems(data);
+
+        TableColumn<UserNoteFX, String> idColumn = new TableColumn<>("ID");
+        idColumn.setCellValueFactory(o -> o.getValue().idProperty());
+        idColumn.setComparator(Comparator.comparingInt(Integer::parseInt));
+        tableView.getColumns().add(idColumn);
+
+        if (includeUserId) {
+            TableColumn<UserNoteFX, String> userColumn = new TableColumn<>("User");
+            userColumn.setCellValueFactory(o -> {
+                PlayerFX user = o.getValue().getUser();
+
+                SimpleStringProperty simpleStringProperty = new SimpleStringProperty();
+                simpleStringProperty.bind(Bindings.createStringBinding(() -> user.getLogin() + " [id " + user.getId() + "]",
+                        user.loginProperty(), user.idProperty()));
+                return simpleStringProperty;
+            });
+            tableView.getColumns().add(userColumn);
+        }
+
+        TableColumn<UserNoteFX, Boolean> watchedCheckBoxColumn = new TableColumn<>("Watched");
+        watchedCheckBoxColumn.setCellValueFactory(param -> param.getValue().watchedProperty());
+        watchedCheckBoxColumn.setCellFactory(CheckBoxTableCell.forTableColumn(watchedCheckBoxColumn));
+        watchedCheckBoxColumn.setEditable(true);
+        tableView.getColumns().add(watchedCheckBoxColumn);
+
+        TableColumn<UserNoteFX, String> noteColumn = new TableColumn<>("Note");
+        noteColumn.setCellValueFactory(param -> param.getValue().noteProperty());
+        noteColumn.setCellFactory(TextAreaTableCell.forTableColumn());
+        noteColumn.setEditable(true);
+        noteColumn.setMinWidth(600);
+        tableView.getColumns().add(noteColumn);
+
+        TableColumn<UserNoteFX, String> authorColumn = new TableColumn<>("Author");
+        authorColumn.setCellValueFactory(o -> {
+            PlayerFX author = o.getValue().getAuthor();
+
+            SimpleStringProperty simpleStringProperty = new SimpleStringProperty();
+            simpleStringProperty.bind(Bindings.createStringBinding(() -> author.getLogin() + " [id " + author.getId() + "]",
+                    author.loginProperty(), author.idProperty()));
+            return simpleStringProperty;
+        });
+        authorColumn.setMinWidth(150);
+        tableView.getColumns().add(authorColumn);
+
+        TableColumn<UserNoteFX, OffsetDateTime> createTimeColumn = new TableColumn<>("Created");
+        createTimeColumn.setCellValueFactory(o -> o.getValue().createTimeProperty());
+        createTimeColumn.setMinWidth(160);
+        tableView.getColumns().add(createTimeColumn);
+
+        TableColumn<UserNoteFX, OffsetDateTime> updateTimeColumn = new TableColumn<>("Last update");
+        updateTimeColumn.setCellValueFactory(o -> o.getValue().updateTimeProperty());
+        updateTimeColumn.setMinWidth(160);
+        tableView.getColumns().add(updateTimeColumn);
+    }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java
index dc32e7c..ab5d463 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java
@@ -1,6 +1,7 @@
 package com.faforever.moderatorclient.ui.domain;
 
 import com.faforever.moderatorclient.mapstruct.JavaFXMapper;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import org.mapstruct.Mapper;
@@ -12,6 +13,7 @@ public class PlayerFX extends AbstractEntityFX {
     private final StringProperty userAgent;
     private final StringProperty steamId;
     private final StringProperty recentIpAddress;
+    private final StringProperty representation;
 //    private final ListProperty<NameRecord> names;
 
     public PlayerFX() {
@@ -20,6 +22,9 @@ public PlayerFX() {
         userAgent = new SimpleStringProperty();
         steamId = new SimpleStringProperty();
         recentIpAddress = new SimpleStringProperty();
+
+        representation = new SimpleStringProperty();
+        representation.bind(Bindings.concat(login, " [id ", idProperty(), "]"));
     }
 
 //    @Relationship("globalRating")
@@ -98,4 +103,8 @@ public void setRecentIpAddress(String recentIpAddress) {
     public StringProperty recentIpAddressProperty() {
         return recentIpAddress;
     }
+
+    public StringProperty representationProperty() {
+        return representation;
+    }
 }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java
new file mode 100644
index 0000000..171059e
--- /dev/null
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java
@@ -0,0 +1,68 @@
+package com.faforever.moderatorclient.ui.domain;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+
+public class UserNoteFX extends AbstractEntityFX {
+    private final ObjectProperty<PlayerFX> user;
+    private final ObjectProperty<PlayerFX> author;
+    private final SimpleBooleanProperty watched;
+    private final SimpleStringProperty note;
+
+    public UserNoteFX() {
+        user = new SimpleObjectProperty<>();
+        author = new SimpleObjectProperty<>();
+        watched = new SimpleBooleanProperty();
+        note = new SimpleStringProperty();
+    }
+
+    public PlayerFX getUser() {
+        return user.get();
+    }
+
+    public void setUser(PlayerFX user) {
+        this.user.set(user);
+    }
+
+    public ObjectProperty<PlayerFX> userProperty() {
+        return user;
+    }
+
+    public PlayerFX getAuthor() {
+        return author.get();
+    }
+
+    public void setAuthor(PlayerFX author) {
+        this.author.set(author);
+    }
+
+    public ObjectProperty<PlayerFX> authorProperty() {
+        return author;
+    }
+
+    public boolean isWatched() {
+        return watched.get();
+    }
+
+    public void setWatched(boolean watched) {
+        this.watched.set(watched);
+    }
+
+    public SimpleBooleanProperty watchedProperty() {
+        return watched;
+    }
+
+    public String getNote() {
+        return note.get();
+    }
+
+    public void setNote(String note) {
+        this.note.set(note);
+    }
+
+    public SimpleStringProperty noteProperty() {
+        return note;
+    }
+}
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
index 7f9d075..05bd235 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
@@ -7,9 +7,13 @@
 import com.faforever.moderatorclient.ui.*;
 import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
 import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
+import com.faforever.moderatorclient.ui.domain.PlayerFX;
+import com.faforever.moderatorclient.ui.domain.UserNoteFX;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
@@ -33,6 +37,8 @@ public class UserManagementController implements Controller<SplitPane> {
     private final PlayerMapper playerMapper;
     private final GamePlayerStatsMapper gamePlayerStatsMapper;
 
+    private final ObservableList<UserNoteFX> userNotes;
+
     private final String replayDownLoadFormat;
 
     public SplitPane root;
@@ -44,6 +50,9 @@ public class UserManagementController implements Controller<SplitPane> {
     public RadioButton searchUserBySteamIdRadioButton;
     public RadioButton searchUserByIpRadioButton;
     public TextField userSearchTextField;
+    public TableView<UserNoteFX> userNoteTableView;
+    public Button addNoteButton;
+    public Button editNoteButton;
     public Button newBanButton;
     public Button editBanButton;
     public TableView<Player> userSearchTableView;
@@ -64,6 +73,7 @@ public UserManagementController(UiService uiService, PlatformService platformSer
         this.playerMapper = playerMapper;
         this.gamePlayerStatsMapper = gamePlayerStatsMapper;
         this.replayDownLoadFormat = replayDownLoadFormat;
+        userNotes = FXCollections.observableArrayList();
     }
 
     @Override
@@ -74,10 +84,14 @@ public SplitPane getRoot() {
     @FXML
     public void initialize() {
         ViewHelper.buildUserTableView(userSearchTableView);
+        ViewHelper.buildNotesTableView(userNoteTableView, userNotes, false);
         ViewHelper.buildNameHistoryTableView(userNameHistoryTableView);
         ViewHelper.buildBanTableView(userBansTableView);
         ViewHelper.buildPlayersGamesTable(userLastGamesTable, replayDownLoadFormat, platformService);
 
+        addNoteButton.disableProperty().bind(userSearchTableView.getSelectionModel().selectedItemProperty().isNull());
+        editNoteButton.disableProperty().bind(userNoteTableView.getSelectionModel().selectedItemProperty().isNull());
+
         loadMoreGamesButton.visibleProperty()
                 .bind(Bindings.createBooleanBinding(() -> userLastGamesTable.getItems().size() != 0 && userLastGamesTable.getItems().size() % 100 == 0, userLastGamesTable.getItems()));
 
@@ -107,10 +121,11 @@ public FeaturedModFX fromString(String string) {
         ViewHelper.buildUserAvatarsTableView(userAvatarsTableView);
 
         userSearchTableView.getSelectionModel().selectedItemProperty().addListener(this::onSelectedUser);
-        userBansTableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> editBanButton.setDisable(newValue == null));
+        editBanButton.disableProperty().bind(userBansTableView.getSelectionModel().selectedItemProperty().isNull());
     }
 
     private void onSelectedUser(ObservableValue<? extends Player> observable, Player oldValue, Player newValue) {
+        userNoteTableView.getItems().clear();
         userNameHistoryTableView.getItems().clear();
         userNameHistoryTableView.getSortOrder().clear();
         userBansTableView.getItems().clear();
@@ -122,7 +137,11 @@ private void onSelectedUser(ObservableValue<? extends Player> observable, Player
         userLastGamesTable.getItems().clear();
         userLastGamesTable.getSortOrder().clear();
 
+        userNoteTableView.getSortOrder().clear();
+        userNotes.clear();
+
         if (newValue != null) {
+            userNotes.addAll(userService.getUserNotes(newValue.getId()));
             userNameHistoryTableView.getItems().addAll(newValue.getNames());
             userBansTableView.getItems().addAll(newValue.getBans());
             userTeamkillsTableView.getItems().addAll(userService.findTeamkillsByUserId(newValue.getId()));
@@ -162,7 +181,7 @@ public void onUserSearch() {
 
     public void onNewBan() {
         Player selectedPlayer = userSearchTableView.getSelectionModel().getSelectedItem();
-        Assert.notNull(selectedPlayer, "Tou need to select a player to create a ban.");
+        Assert.notNull(selectedPlayer, "You need to select a player to create a ban.");
 
         BanInfoController banInfoController = uiService.loadFxml("ui/banInfo.fxml");
         banInfoController.setBanInfo(new BanInfo()
@@ -192,4 +211,35 @@ public void loadMoreGames() {
         userGamesPage++;
         loadMoreGamesRunnable.run();
     }
+
+    public void addNote() {
+        PlayerFX selectedPlayer = playerMapper.map(userSearchTableView.getSelectionModel().getSelectedItem());
+        Assert.notNull(selectedPlayer, "You need to select a player to create a userNote.");
+
+        UserNoteController userNoteController = uiService.loadFxml("ui/userNote.fxml");
+
+        UserNoteFX userNoteFX = new UserNoteFX();
+        userNoteFX.setUser(selectedPlayer);
+        userNoteController.addPostedListener(userNotes::add);
+
+        userNoteController.setUserNoteFX(userNoteFX);
+
+        Stage userNoteDialog = new Stage();
+        userNoteDialog.setTitle("Add new user note");
+        userNoteDialog.setScene(new Scene(userNoteController.getRoot()));
+        userNoteDialog.showAndWait();
+    }
+
+    public void editNote() {
+        UserNoteFX selectedUserNote = userNoteTableView.getSelectionModel().getSelectedItem();
+        Assert.notNull(selectedUserNote, "You need to select a user note to edit it.");
+
+        UserNoteController userNoteController = uiService.loadFxml("ui/userNote.fxml");
+        userNoteController.setUserNoteFX(selectedUserNote);
+
+        Stage userNoteDialog = new Stage();
+        userNoteDialog.setTitle("Edit user note");
+        userNoteDialog.setScene(new Scene(userNoteController.getRoot()));
+        userNoteDialog.showAndWait();
+    }
 }
diff --git a/src/main/resources/ui/main_window/userManagement.fxml b/src/main/resources/ui/main_window/userManagement.fxml
index 716b9a9..0609ed6 100644
--- a/src/main/resources/ui/main_window/userManagement.fxml
+++ b/src/main/resources/ui/main_window/userManagement.fxml
@@ -3,7 +3,7 @@
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.5" orientation="VERTICAL"
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" dividerPositions="0.3" orientation="VERTICAL"
            prefHeight="200.0" prefWidth="160.0" xmlns="http://javafx.com/javafx/8.0.111"
            fx:controller="com.faforever.moderatorclient.ui.main_window.UserManagementController">
     <items>
@@ -71,6 +71,35 @@
         </HBox>
         <TabPane minHeight="200.0" tabClosingPolicy="UNAVAILABLE">
             <tabs>
+                <Tab text="Notes">
+                    <content>
+                        <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+                            <children>
+                                <TableView fx:id="userNoteTableView" prefHeight="200.0" prefWidth="200.0"
+                                           VBox.vgrow="ALWAYS">
+                                    <VBox.margin>
+                                        <Insets bottom="10.0"/>
+                                    </VBox.margin>
+                                </TableView>
+                                <HBox alignment="CENTER">
+                                    <children>
+                                        <Button fx:id="addNoteButton" mnemonicParsing="false" onAction="#addNote"
+                                                text="Add note"/>
+                                        <Button fx:id="editNoteButton" mnemonicParsing="false" onAction="#editNote"
+                                                text="Edit selected note">
+                                            <HBox.margin>
+                                                <Insets left="10.0"/>
+                                            </HBox.margin>
+                                        </Button>
+                                    </children>
+                                    <padding>
+                                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+                                    </padding>
+                                </HBox>
+                            </children>
+                        </VBox>
+                    </content>
+                </Tab>
                 <Tab text="Bans">
                     <content>
                         <VBox>
diff --git a/src/main/resources/ui/userNote.fxml b/src/main/resources/ui/userNote.fxml
new file mode 100644
index 0000000..4d9c63b
--- /dev/null
+++ b/src/main/resources/ui/userNote.fxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<GridPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" hgap="10.0" vgap="10.0"
+          xmlns="http://javafx.com/javafx/8.0.111" fx:controller="com.faforever.moderatorclient.ui.UserNoteController">
+    <columnConstraints>
+        <ColumnConstraints hgrow="SOMETIMES"/>
+        <ColumnConstraints hgrow="ALWAYS"/>
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints fillHeight="false"/>
+        <RowConstraints fillHeight="false" minHeight="10.0" prefHeight="30.0"/>
+        <RowConstraints fillHeight="false"/>
+        <RowConstraints fillHeight="false" vgrow="NEVER"/>
+        <RowConstraints fillHeight="false"/>
+    </rowConstraints>
+    <children>
+        <Label text="Affected User"/>
+        <Label text="Author" GridPane.rowIndex="1"/>
+        <Label text="Note" GridPane.rowIndex="2"/>
+        <Label text="Watched" GridPane.rowIndex="3" GridPane.valignment="TOP">
+            <GridPane.margin>
+                <Insets top="3.0"/>
+            </GridPane.margin>
+        </Label>
+        <TextField fx:id="affectedUserTextField" disable="true" editable="false" GridPane.columnIndex="1"/>
+        <TextField fx:id="authorTextField" disable="true" editable="false" promptText="Will be you"
+                   GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+        <VBox GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.vgrow="ALWAYS">
+            <children>
+                <CheckBox fx:id="watchedCheckBox" mnemonicParsing="false"/>
+            </children>
+        </VBox>
+        <HBox alignment="BOTTOM_RIGHT" GridPane.columnSpan="2147483647" GridPane.rowIndex="4" GridPane.vgrow="ALWAYS">
+            <children>
+                <Button defaultButton="true" mnemonicParsing="false" onAction="#onSave" text="Save changes"/>
+                <Button cancelButton="true" mnemonicParsing="false" onAction="#onAbort" text="Abort editing">
+                    <HBox.margin>
+                        <Insets left="10.0"/>
+                    </HBox.margin>
+                </Button>
+            </children>
+            <opaqueInsets>
+                <Insets/>
+            </opaqueInsets>
+            <GridPane.margin>
+                <Insets top="20.0"/>
+            </GridPane.margin>
+        </HBox>
+        <TextArea fx:id="noteTextArea" prefHeight="200.0" prefWidth="400.0" promptText="Text goes here"
+                  GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+    </children>
+    <padding>
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+    </padding>
+</GridPane>

From 1fae21d35baadf952ba5411a6a14f1f4187bd4d7 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Sun, 17 Dec 2017 21:24:54 +0100
Subject: [PATCH 13/14] fixes #16 renaming according to API

---
 .../moderatorclient/api/dto/UserNote.java      |  4 ++--
 .../api/rest/FafApiCommunicationService.java   |  4 ++--
 .../api/rest/domain/AvatarService.java         |  2 +-
 .../api/rest/domain/UserService.java           | 18 +++++++++---------
 .../moderatorclient/ui/BanInfoController.java  |  2 +-
 .../moderatorclient/ui/TextAreaTableCell.java  |  2 +-
 .../moderatorclient/ui/UserNoteController.java |  4 ++--
 .../moderatorclient/ui/ViewHelper.java         |  4 ++--
 .../moderatorclient/ui/domain/UserNoteFX.java  | 16 ++++++++--------
 .../main_window/UserManagementController.java  |  8 ++++----
 src/main/resources/ui/main_window/avatars.fxml |  2 +-
 .../ui/main_window/userManagement.fxml         |  2 +-
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java b/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java
index b9375ea..dbbf110 100644
--- a/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java
+++ b/src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java
@@ -10,8 +10,8 @@
 @Type("userNote")
 @RestrictedVisibility("IsModerator")
 public class UserNote extends AbstractEntity {
-    @Relationship("user")
-    private Player user;
+    @Relationship("player")
+    private Player player;
     @Relationship("author")
     private Player author;
     private boolean watched;
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java b/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java
index 067e017..8486bbe 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/FafApiCommunicationService.java
@@ -74,7 +74,7 @@ public FafApiCommunicationService(ResourceConverter resourceConverter, RestTempl
 
     @SneakyThrows
     private void authorize(String username, String password) {
-        log.debug("Configuring OAuth2 login with user = '{}', password=[hidden]", username);
+        log.debug("Configuring OAuth2 login with player = '{}', password=[hidden]", username);
         ResourceOwnerPasswordResourceDetails details = new ResourceOwnerPasswordResourceDetails();
         details.setClientId(apiClientId);
         details.setClientSecret(apiClientSecret);
@@ -89,7 +89,7 @@ private void authorize(String username, String password) {
     }
 
     /**
-     * @return LegacyAccessLevel of the user if login was successful, else null
+     * @return LegacyAccessLevel of the player if login was successful, else null
      */
     public LegacyAccessLevel login(String username, String password) {
         authorize(username, password);
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/AvatarService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/AvatarService.java
index 6e512a1..50c6796 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/AvatarService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/AvatarService.java
@@ -48,7 +48,7 @@ public List<Avatar> findAvatarsByTooltip(@NotNull String pattern) {
     }
 
     public List<Avatar> findAvatarsByAssignedUser(@NotNull String pattern) {
-        log.debug("Searching for avatars by assigned user with pattern: {}", pattern);
+        log.debug("Searching for avatars by assigned player with pattern: {}", pattern);
         ElideRouteBuilder<Avatar> routeBuilder = ElideRouteBuilder.of(Avatar.class)
                 .addInclude("assignments")
                 .addInclude("assignments.player")
diff --git a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
index fa900ed..09beb69 100644
--- a/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/rest/domain/UserService.java
@@ -68,7 +68,7 @@ public List<Player> findLatestRegistrations() {
     }
 
     private List<Player> findUsersByAttribute(@NotNull String attribute, @NotNull String pattern) {
-        log.debug("Searching for user by attribute '{}' with pattern: {}", attribute, pattern);
+        log.debug("Searching for player by attribute '{}' with pattern: {}", attribute, pattern);
         ElideRouteBuilder<Player> routeBuilder = ElideRouteBuilder.of(Player.class)
                 .filter(ElideRouteBuilder.qBuilder().string(attribute).eq(pattern));
         addModeratorIncludes(routeBuilder);
@@ -99,7 +99,7 @@ public List<Player> findUserByIP(@NotNull String pattern) {
     }
 
     public Collection<Player> findUsersByPreviousName(@NotNull String pattern) {
-        log.debug("Searching for user by previous name with pattern: {}", pattern);
+        log.debug("Searching for player by previous name with pattern: {}", pattern);
         ElideRouteBuilder<NameRecord> routeBuilder = ElideRouteBuilder.of(NameRecord.class)
                 .addInclude("player")
                 .filter(ElideRouteBuilder.qBuilder().string("name").eq(pattern));
@@ -125,7 +125,7 @@ public List<Teamkill> findLatestTeamkills() {
     }
 
     public List<Teamkill> findTeamkillsByUserId(@NotNull String userId) {
-        log.debug("Searching for teamkills invoked by user id: {}", userId);
+        log.debug("Searching for teamkills invoked by player id: {}", userId);
         ElideRouteBuilder<Teamkill> routeBuilder = ElideRouteBuilder.of(Teamkill.class)
                 .addInclude("teamkiller")
                 .addInclude("victim")
@@ -158,7 +158,7 @@ public BanInfo createBan(@NotNull BanInfo banInfo) {
     }
 
     public List<GamePlayerStats> getLastHundredPlayedGamesByFeaturedMod(@NotNull String userId, int page, FeaturedModFX featuredModFX) {
-        log.debug("Searching for games played by user id: {}", userId);
+        log.debug("Searching for games played by player id: {}", userId);
         ElideRouteBuilder<GamePlayerStats> routeBuilder = ElideRouteBuilder.of(GamePlayerStats.class)
                 .addInclude("game")
                 .addInclude("player")
@@ -186,19 +186,19 @@ public List<FeaturedModFX> getFeaturedMods() {
     }
 
     public UserNoteFX getUserNoteById(@NotNull String userNoteId) {
-        log.debug("Search for user note id: " + userNoteId);
+        log.debug("Search for player note id: " + userNoteId);
         ElideRouteBuilder<UserNote> routeBuilder = ElideRouteBuilder.of(UserNote.class)
                 .id(userNoteId)
-                .addInclude("user")
+                .addInclude("player")
                 .addInclude("author");
         return userNoteMapper.map(fafApi.getOne(routeBuilder));
     }
 
     public List<UserNoteFX> getUserNotes(@NotNull String userId) {
-        log.debug("Search for all note of user id: " + userId);
+        log.debug("Search for all note of player id: " + userId);
         ElideRouteBuilder<UserNote> routeBuilder = ElideRouteBuilder.of(UserNote.class)
-                .filter(ElideRouteBuilder.qBuilder().string("user.id").eq(userId))
-                .addInclude("user")
+                .filter(ElideRouteBuilder.qBuilder().string("player.id").eq(userId))
+                .addInclude("player")
                 .addInclude("author");
         return userNoteMapper.map(fafApi.getAll(routeBuilder));
     }
diff --git a/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java b/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java
index 902a97a..d647d6a 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/BanInfoController.java
@@ -107,7 +107,7 @@ public void onSave() {
         banInfo.setLevel(chatOnlyBanRadioButton.isSelected() ? BanLevel.CHAT : BanLevel.GLOBAL);
 
         if (banInfo.getId() == null) {
-            log.debug("Creating ban for user '{}' with reason: {}", banInfo.getPlayer().toString(), banReasonTextField.getText());
+            log.debug("Creating ban for player '{}' with reason: {}", banInfo.getPlayer().toString(), banReasonTextField.getText());
             userService.createBan(banInfo);
         } else {
             log.debug("Updating ban id '{}'", banInfo.getId());
diff --git a/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java b/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java
index 3d76876..5d9a829 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/TextAreaTableCell.java
@@ -106,7 +106,7 @@ private void updateItem(final Cell<T> cell, final StringConverter<T> converter)
                 cell.setText(getItemText(cell, converter));
                 cell.setGraphic(null);
 
-                //Add text as tooltip so that user can read text without editing it.
+                //Add text as tooltip so that player can read text without editing it.
                 Tooltip tooltip = new Tooltip(getItemText(cell, converter));
                 tooltip.setWrapText(true);
                 tooltip.prefWidthProperty().bind(cell.widthProperty());
diff --git a/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java b/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java
index bf4020a..7ece64e 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/UserNoteController.java
@@ -62,7 +62,7 @@ public void setUserNoteFX(UserNoteFX userNoteFX) {
         this.userNoteFX = userNoteFX;
 
         if (userNoteFX != null) {
-            Optional.ofNullable(userNoteFX.getUser()).ifPresent(author -> affectedUserTextField.textProperty().bind(author.representationProperty()));
+            Optional.ofNullable(userNoteFX.getPlayer()).ifPresent(author -> affectedUserTextField.textProperty().bind(author.representationProperty()));
             Optional.ofNullable(userNoteFX.getAuthor()).ifPresent(author -> authorTextField.textProperty().bind(author.representationProperty()));
             watchedCheckBox.setSelected(userNoteFX.isWatched());
 
@@ -81,7 +81,7 @@ public void onSave() {
         userNoteFX.setWatched(watchedCheckBox.isSelected());
 
         if (userNoteFX.getId() == null) {
-            log.debug("Creating userNote for user '{}'", userNoteFX.getUser().representationProperty().get());
+            log.debug("Creating userNote for player '{}'", userNoteFX.getPlayer().representationProperty().get());
             String newNoteId = userService.createUserNote(userNoteMapper.map(userNoteFX));
             UserNoteFX loadedUserNote = userService.getUserNoteById(newNoteId);
             postedListener.accept(loadedUserNote);
diff --git a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
index 314ea5e..6ea06d2 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java
@@ -608,9 +608,9 @@ public static void buildNotesTableView(TableView<UserNoteFX> tableView, Observab
         tableView.getColumns().add(idColumn);
 
         if (includeUserId) {
-            TableColumn<UserNoteFX, String> userColumn = new TableColumn<>("User");
+            TableColumn<UserNoteFX, String> userColumn = new TableColumn<>("Player");
             userColumn.setCellValueFactory(o -> {
-                PlayerFX user = o.getValue().getUser();
+                PlayerFX user = o.getValue().getPlayer();
 
                 SimpleStringProperty simpleStringProperty = new SimpleStringProperty();
                 simpleStringProperty.bind(Bindings.createStringBinding(() -> user.getLogin() + " [id " + user.getId() + "]",
diff --git a/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java b/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java
index 171059e..1651c54 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/domain/UserNoteFX.java
@@ -6,28 +6,28 @@
 import javafx.beans.property.SimpleStringProperty;
 
 public class UserNoteFX extends AbstractEntityFX {
-    private final ObjectProperty<PlayerFX> user;
+    private final ObjectProperty<PlayerFX> player;
     private final ObjectProperty<PlayerFX> author;
     private final SimpleBooleanProperty watched;
     private final SimpleStringProperty note;
 
     public UserNoteFX() {
-        user = new SimpleObjectProperty<>();
+        player = new SimpleObjectProperty<>();
         author = new SimpleObjectProperty<>();
         watched = new SimpleBooleanProperty();
         note = new SimpleStringProperty();
     }
 
-    public PlayerFX getUser() {
-        return user.get();
+    public PlayerFX getPlayer() {
+        return player.get();
     }
 
-    public void setUser(PlayerFX user) {
-        this.user.set(user);
+    public void setPlayer(PlayerFX player) {
+        this.player.set(player);
     }
 
-    public ObjectProperty<PlayerFX> userProperty() {
-        return user;
+    public ObjectProperty<PlayerFX> playerProperty() {
+        return player;
     }
 
     public PlayerFX getAuthor() {
diff --git a/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java b/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
index 05bd235..f26c89a 100644
--- a/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
+++ b/src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java
@@ -219,26 +219,26 @@ public void addNote() {
         UserNoteController userNoteController = uiService.loadFxml("ui/userNote.fxml");
 
         UserNoteFX userNoteFX = new UserNoteFX();
-        userNoteFX.setUser(selectedPlayer);
+        userNoteFX.setPlayer(selectedPlayer);
         userNoteController.addPostedListener(userNotes::add);
 
         userNoteController.setUserNoteFX(userNoteFX);
 
         Stage userNoteDialog = new Stage();
-        userNoteDialog.setTitle("Add new user note");
+        userNoteDialog.setTitle("Add new player note");
         userNoteDialog.setScene(new Scene(userNoteController.getRoot()));
         userNoteDialog.showAndWait();
     }
 
     public void editNote() {
         UserNoteFX selectedUserNote = userNoteTableView.getSelectionModel().getSelectedItem();
-        Assert.notNull(selectedUserNote, "You need to select a user note to edit it.");
+        Assert.notNull(selectedUserNote, "You need to select a player note to edit it.");
 
         UserNoteController userNoteController = uiService.loadFxml("ui/userNote.fxml");
         userNoteController.setUserNoteFX(selectedUserNote);
 
         Stage userNoteDialog = new Stage();
-        userNoteDialog.setTitle("Edit user note");
+        userNoteDialog.setTitle("Edit player note");
         userNoteDialog.setScene(new Scene(userNoteController.getRoot()));
         userNoteDialog.showAndWait();
     }
diff --git a/src/main/resources/ui/main_window/avatars.fxml b/src/main/resources/ui/main_window/avatars.fxml
index e4abf3a..3bd2d53 100644
--- a/src/main/resources/ui/main_window/avatars.fxml
+++ b/src/main/resources/ui/main_window/avatars.fxml
@@ -35,7 +35,7 @@
                                     </VBox.margin>
                                 </RadioButton>
                                 <RadioButton fx:id="searchAvatarsByAssignedUserRadioButton" mnemonicParsing="false"
-                                             text="search by assigned user" toggleGroup="$avatarSearch">
+                                             text="search by assigned player" toggleGroup="$avatarSearch">
                                     <VBox.margin>
                                         <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                                     </VBox.margin>
diff --git a/src/main/resources/ui/main_window/userManagement.fxml b/src/main/resources/ui/main_window/userManagement.fxml
index 0609ed6..6b6a2ce 100644
--- a/src/main/resources/ui/main_window/userManagement.fxml
+++ b/src/main/resources/ui/main_window/userManagement.fxml
@@ -55,7 +55,7 @@
                                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                             </VBox.margin>
                         </TextField>
-                        <Button mnemonicParsing="false" onAction="#onUserSearch" text="search user">
+                        <Button mnemonicParsing="false" onAction="#onUserSearch" text="search player">
                             <VBox.margin>
                                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                             </VBox.margin>

From 6e27a3d13c787b83e85b05e1252bce1efb256707 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <c-schmidt@gmx.eu>
Date: Sun, 17 Dec 2017 23:52:29 +0100
Subject: [PATCH 14/14] Bump version to 0.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63760d6..d5976f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.faforever</groupId>
     <artifactId>faf-moderator-client</artifactId>
-    <version>0.1.2</version>
+    <version>0.2.0</version>
     <packaging>jar</packaging>
 
     <name>faf-moderator-client</name>