updated nav and fixed code