Fix Several of Bug in  Navigation's bar