fix click events and change calc for watchlist/portfolio