tidied up nav type