Minor improvements with spaces in command window labels