Added images.
Refactor the favorite view part to solve issue regarding unfav from the fav view