Changed buttons behavior