Tighten up layout.