Consolidate refresh into single button
Merge upstream changes
Merge pull request #113 from thewheat/single-refresh

Single refresh button