updated navigation properties to address ui.presentation/definition
issues