Fixed up code in the original and made a class for all the button set up
to shorten the  code. Added finals and privates, etc for the needed
items, however many will probably be not needed after full overhaul