Fixed up Service window to match client window.