Clean-up favorites
First favorites
Fix issue with missing favorites on load
Fix issues with positioning of favorites