Changed NavigationManager before reverting
Switched over most to ContentProviders except for tabs, resource change events and navigation