Fixed button functionality