Bug fixes + Favourites controller added