Converted Favorites to a standard window with 2 views, cleanup