some changes over navigation and other small fixes