Lots of layout cleanups.