Refresh button Removed and other improvements