favorites page updates
favorites page updates
merge conflicts fixed