better routing all around
Merge pull request #40 from zelzel2315/button

better routing all around