Made it so you can go back now from Favourites
Merge branch 'FavFix' into dev