Changed current_view_controller to accommodate ProMotion-menu