fix nav
fix pull master