Kevin/nav formatting