Added JButton Preference to mainGUI.java (still need tweaks)
minor bug fix
Added Global JButton changes
Merge branch 'douglas' into menu