Favourites functionality is working

Merged Favourites to master