Add favourites option

Adds in favourites option and re-works a few things

@peter-riggs fyi