Added support for both presentations: navigation and modal