Major navigation refactor
Updated docs