More JFX and refactoring