Button fix

Fixed fav button class assignment error, spelling error, and general
refactor