chinh sua code, comment code , write test navigation