Added refresh button and working