Refactored with UITableViewController as container view