Added toggle button and refresh button