Layout cleanups.