Use surnames only for doubles matches.
Move server indicator next to name on right-hand side, rather than have it as part of the points score.