Tweaked client index layout