fixed button and on click issues