Refresh button and some improvements