Cleaning up layout.