Coding Nav and wrapper

adding nav and wrapper coding, fixing code