Improve JFx CLient