Switched to buttons linked to slots
Merge pull request #68 from nolanfilter/Nolan

Buttons linked to slots