Updated view controller to fix zombie objects