fix nav order, remove unused stuff

Signed-off-by: Peter T. Brown <peter@flippyhead.com>