Changed logic in Container ViewController