Cleaning up layout just a bit.