     super.viewDidDisappear(animated)
     
     activeView.removeFromSuperview()
+  }
+  
+  // MARK: Subview Layout
+  
+  func frameBelowNavigationBar() -> CGRect {
+    return CGRect(x: 0, y: topLayoutGuide.length, width: view.bounds.size.width, height: view.bounds.size.height - topLayoutGuide.length)
+  }
+  
+  override func viewDidLayoutSubviews() {
+    activeView.frame = frameBelowNavigationBar()
   }
   
   // MARK: Segues

    if (selectedTrip.waypoints?.count == 0) {
      activeView = noWayPointsView
      view.addSubview(activeView)
      activeView.frame = view.frame
    } else {
      activeView = someWayPointsView
      view.addSubview(activeView)
      activeView.frame = view.frame
    }
  
  }

  var currentWaypoint: Waypoint?
  var currentContext: NSManagedObjectContext?
  
  // MARK: View Lifecycle
  
  override func viewWillAppear(animated: Bool) {
    super.viewWillAppear(animated)
    
