bugfixes according to model refactoring (no JavaFX in model anymore)