Fixed navigation issue again using a different method. Needs testing on
the phone as it appears slow on the emulator.