New Added Feature - Favorites and several modifications