TopNavigator, Main and Visits fix