Improve JavaFx client