Remove no longer user RootFactory
Fix navbar highlighting