Rich Content View Controller Refactored