FInal fix (I hope) for using Navigation intent and closing issue #5