Changes added and support to the nav