made buttons acceptable
Merge pull request #37 from goodybag/37-bug-buttons

Buttons look nothing like design
Merge branch 'master' into 18-infinite-scroll