CW: Fixed nav issue with circles
CW: Added favouriting capability