Iss#11fav button

Cleaned Code and other fixes!