Fix for ui errors in favorites and watchlist.
Fixed some typos, added some comments and minor change in some methods.
Reorganized imports
Tried to make most of the fields NonNull. Optimized and changed some methods accordingly.