using selected method for buttons
cleaning
Merge pull request #206 from calblueprint/jordeen/buttonfix

Jordeen/buttonfix