Cleaned up layout a bit.