More layout cleanups, more content.