Changed NavigationUI to use @-syntax