(Bug 4715) Slightly more compact layout