Refresh button fix v0.1