Improve the render flow for the summary view. #27