Cleaning up layout better.