fixed the navigation positionoing
refactored water basic quantity