updated navigation with checks