fix few event and nav bug