Cleaned up layout a little.