Fix on buttons
Fix more buttons