Got nav working properly