Clean up layout to suit design.