all button problems fixed