Added Favourites, various tweaks