Attempting to fix up layout.