Updated favorites icon, refactored code to be more modular.