changed the NAV to the overall style
Merge branch 'master' of https://github.com/meizzhou/final