STS-3599: Layout fixes.