         performSegue(withIdentifier: AudioItemsController.SegueIdentifier, sender: view)
       }
       else {
-        if callSeque {
-//          performSegue(withIdentifier: MediaItemsController.SegueIdentifier, sender: view)
-          let BundleIdentifier = "com.rubikon.EtvnetSite-iOS"
-
-          let bundle = Bundle(identifier: BundleIdentifier)!
-
-          let storyboard = UIStoryboard(name: "Etvnet-iOS", bundle: bundle)
-
-          let destination = storyboard.instantiateViewController(withIdentifier: "MediaItemsController") as! MediaItemsController
-
-          destination.callSeque = callSeque
-
-          let newAdapter = adapter.clone()
-          newAdapter.selectedItem = mediaItem
-
-          newAdapter.parentId = mediaItem.id
-          newAdapter.parentName = mediaItem.name
-          newAdapter.isContainer = true
-
-          destination.adapter = newAdapter
-
-          destination.collectionView?.collectionViewLayout = adapter.buildLayout()!
-
+        var destination: MediaItemsController!
+
+//        if navigationController != nil {
+//          destination = MediaItemsController.instantiate(storyboardId: "Etvnet-iOS", bundleIdentifier: "com.rubikon.EtvnetSite-iOS")
+//
+//        }
+//        else {
+//          destination = MediaItemsController.instantiate()
+//        }
+
+        destination = MediaItemsController.instantiate()
+
+        let newAdapter = adapter.clone()
+        newAdapter.selectedItem = mediaItem
+
+        newAdapter.parentId = mediaItem.id
+        newAdapter.parentName = mediaItem.name
+        newAdapter.isContainer = true
+
+        destination!.adapter = newAdapter
+
+        destination.collectionView?.collectionViewLayout = adapter.buildLayout()!
+
+        if navigationController != nil {
           navigationController!.pushViewController(destination, animated: true)
         }
         else {
-          let destination = MediaItemsController.instantiate()
-
-          destination.callSeque = callSeque
-
-          let newAdapter = adapter.clone()
-          newAdapter.selectedItem = mediaItem
-
-          newAdapter.parentId = mediaItem.id
-          newAdapter.parentName = mediaItem.name
-          newAdapter.isContainer = true
-
-          destination.adapter = newAdapter
-
-          destination.collectionView?.collectionViewLayout = adapter.buildLayout()!
-
           self.present(destination, animated: true)
         }
       }

      switch identifier {
        case MediaItemsController.SegueIdentifier:
          if let destination = segue.destination.getActionController() as? MediaItemsController {
            destination.callSeque = callSeque

            let newAdapter = adapter.clone()
            newAdapter.selectedItem = mediaItem

open class MediaItemsController: InfiniteCollectionViewController {
  public class var SegueIdentifier: String { return  "MediaItems" }

  //public var callSeque = false

  var CellIdentifier: String { return  "MediaItemCell" }
  var HeaderViewIdentifier: String { return  "MediaItemsHeader" }
  var localizer = Localizer("com.rubikon.TVSetKit")

  static public func instantiate(storyboardId: String="Player", bundleIdentifier: String="com.rubikon.TVSetKit") -> Self {
    let bundle = Bundle(identifier: bundleIdentifier)!

    return AppStoryboard.instantiateController(storyboardId, bundle: bundle, viewControllerClass: self)
  }

  override open func viewDidLoad() {
