Various template improvements on friends-selector