Fix name on navbar
Fix calendar's  more option