Added navigate preventions