Fixing navigation buttons