Improve Facter navigation