fix up layout