Add better watchlist and refresh button