JavaFx improvements