I moved the uniform in f882120.  Were there additional whitespace problems?