Radio Button tweaked and adapted to work with Java8