Deleted unnecessary lines of code
Cleaned up the code, used the button class more