Some layout cleanups.