improvements to nav function and ui