Change to use JavaFX