Some layout and cleanup.