new templates, some cleanups, favourites, pagination