Lots of small changes and added files for future changes to the buttons