Fixing nav button behaviour