finish navigation
Merge branch 'master' of https://github.com/fywb251/bsl-client