fixed broken things
fixed show page conflict
Merge pull request #47 from ricarora/button-bug-fix

fixed broken things