Fix navbar issue