reworked the player inclusion model for the watchlist
Merge branch 'layout-cs' into layout-mh