All changes made. A few bugs in java button group keep poping up and no fix was found