#21 Improvements to JavaFX demo