fixed button issue

and other things