Switch to java8, use controlsfx and much more.
Test
More cleanup