Reorganized outline and content flow