Changed the name of a couple button handlers to be more descriptive
Merge pull request #75 from Databean/minor_controller_refactor

Changed the name of a couple button handlers to be more descriptive