Added a few more buttons and appropriate listeners. Small amount of refactoring.