Fixing the random nav bar click issues