Added links, display favorites (parts 1 and 2)