new changes #buttons don't work properly