changing button clicks around
fixed song logic
Merge pull request #1 from pelletized/refactor_button_clicks

Refactor button clicks