Favorites screens ui added. Some refactoring