Removed some duplication on refresh.  Fixed bug where big refresh button would override