fix Navigation Bugs..