Adding favourites feature

Plus some other changes