More improvements for presentation.