fixes with button clicks